Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_hints.c e_main.c 


Log Message:
Fix send border to 0, 0 problem.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- e_hints.c   16 Jun 2005 02:12:15 -0000      1.52
+++ e_hints.c   17 Jun 2005 09:29:27 -0000      1.53
@@ -1059,24 +1059,22 @@
 void
 e_hints_window_desktop_set(E_Border *bd)
 {
+   /* This function is only called when really changing desktop,
+    * so just set the property and don't care about the roundtrip.
+    */
    unsigned int deskpos[2];
-   unsigned int current;
 
-   current = (bd->desk->y * bd->zone->desk_x_count) + bd->desk->x;
    /* if valgrind complains here it is complaining bd->client.netwm.desktop
     * is an uninitialised variable - but it isn't. it can't be. its part of
     * a calloc()'d struct and thus has to have been set to 0. hell even
     * e_border.c explicitly sets it to 0 on creation of the border object.
     */
-   if (bd->client.netwm.desktop != current)
-     {
-       deskpos[0] = bd->desk->x;
-       deskpos[1] = bd->desk->y;
-       ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_DESK, deskpos, 2);
+   deskpos[0] = bd->desk->x;
+   deskpos[1] = bd->desk->y;
+   ecore_x_window_prop_card32_set(bd->client.win, E_ATOM_DESK, deskpos, 2);
 
 #if 0
-       ecore_x_netwm_desktop_set(bd->client.win, current);
+   ecore_x_netwm_desktop_set(bd->client.win, current);
 #endif
-       bd->client.netwm.desktop = current;
-     }
+   bd->client.netwm.desktop = (bd->desk->y * bd->zone->desk_x_count) + 
bd->desk->x;
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- e_main.c    16 Jun 2005 12:28:59 -0000      1.100
+++ e_main.c    17 Jun 2005 09:29:27 -0000      1.101
@@ -700,10 +700,9 @@
        if (con)
          {
             e_container_show(con);
-            e_manager_manage_windows(man);
-            /* setup hints */
             e_hints_manager_init(man);
             _e_main_desk_restore(man, con);
+            e_manager_manage_windows(man);
          }
        else
          {




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to