discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=044edb7925472a86fe63491d7a4b0eab3558e675

commit 044edb7925472a86fe63491d7a4b0eab3558e675
Author: Mike Blumenkrantz <[email protected]>
Date:   Wed May 7 21:36:25 2014 -0400

    only use e_exec's vdesk if client does not use its remember's vdesk
---
 src/bin/e_comp_x.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 494d829..5645e98 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -3931,15 +3931,18 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, 
E_Client *ec)
 
                   if (inst->used == 0)
                     {
-                       E_Zone *zone;
-                       E_Desk *desk;
-
                        inst->used++;
-                       zone = e_comp_zone_number_get(ec->comp, inst->screen);
-                       if (zone) e_client_zone_set(ec, zone);
-                       desk = e_desk_at_xy_get(ec->zone, inst->desk_x,
-                                               inst->desk_y);
-                       if (desk) e_client_desk_set(ec, desk);
+                       if ((!ec->remember) || !(ec->remember->apply & 
E_REMEMBER_APPLY_DESKTOP))
+                         {
+                            E_Zone *zone;
+                            E_Desk *desk;
+
+                            zone = e_comp_zone_number_get(ec->comp, 
inst->screen);
+                            if (zone) e_client_zone_set(ec, zone);
+                            desk = e_desk_at_xy_get(ec->zone, inst->desk_x,
+                                                    inst->desk_y);
+                            if (desk) e_client_desk_set(ec, desk);
+                         }
                        if (ec->netwm.pid != ecore_exe_pid_get(inst->exe))
                          {
                             /* most likely what has happened here is that the 
.desktop launcher

-- 


Reply via email to