Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        E.h desktops.c ewmh.c gnome.c hints.c main.c 


Log Message:
Initial hint setup tweaks.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -3 -r1.391 -r1.392
--- E.h 13 Mar 2005 12:05:22 -0000      1.391
+++ E.h 18 Mar 2005 21:43:41 -0000      1.392
@@ -1819,6 +1819,7 @@
 void                HintsDelWindowHints(EWin * ewin);
 void                HintsProcessPropertyChange(EWin * ewin, Atom atom_change);
 void                HintsProcessClientMessage(XClientMessageEvent * event);
+void                HintsSetRootHints(Window win);
 void                HintsSetRootInfo(Window win, Pixmap pmap, int color);
 
 void                EHintsSetInfo(const EWin * ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- desktops.c  6 Mar 2005 21:29:44 -0000       1.130
+++ desktops.c  18 Mar 2005 21:43:42 -0000      1.131
@@ -431,6 +431,8 @@
        }
    }
 
+   HintsSetRootHints(EoGetWin(d));
+
    /* Set the _XROOT... atoms so apps will find them even before the bg is set 
*/
    HintsSetRootInfo(EoGetWin(d), None, 0);
 
@@ -607,6 +609,8 @@
 
    for (i = 0; i < Conf.desks.num; i++)
       DeskCreate(i, 0);
+
+   HintsSetDesktopConfig();
 }
 
 void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- ewmh.c      26 Feb 2005 16:40:36 -0000      1.65
+++ ewmh.c      18 Mar 2005 21:43:43 -0000      1.66
@@ -154,12 +154,6 @@
 
    /* Set WM info properties */
    ecore_x_netwm_wm_identify(VRoot.win, win_wm_check, e_wm_name);
-
-   EWMH_SetDesktopCount();
-   EWMH_SetDesktopRoots();
-   EWMH_SetDesktopNames();
-   EWMH_SetDesktopSize();
-   EWMH_SetWorkArea();
 }
 
 /*
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/gnome.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- gnome.c     6 Mar 2005 11:17:04 -0000       1.45
+++ gnome.c     18 Mar 2005 21:43:43 -0000      1.46
@@ -725,9 +725,6 @@
 {
    GNOME_SetWMNameVer();
    GNOME_SetUsedHints();
-   GNOME_SetDeskCount();
-   GNOME_SetDeskNames();
-   GNOME_SetAreaCount();
    GNOME_SetWMCheck(win_wm_check);
    {
       Atom                atom_set;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/hints.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- hints.c     6 Mar 2005 11:17:04 -0000       1.35
+++ hints.c     18 Mar 2005 21:43:43 -0000      1.36
@@ -37,9 +37,6 @@
 
    win = ECreateWindow(VRoot.win, -200, -200, 5, 5, 0);
 
-   /* retreive stuff from last time we were loaded if we're restarting */
-   EHintsGetMainInfo();
-
    ICCCM_Init();
 #if ENABLE_GNOME
    GNOME_SetHints(win);
@@ -52,6 +49,12 @@
 }
 
 void
+HintsSetRootHints(Window win __UNUSED__)
+{
+   /* Nothing done here for now */
+}
+
+void
 HintsSetClientList(void)
 {
 #if ENABLE_GNOME
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- main.c      27 Feb 2005 14:42:40 -0000      1.116
+++ main.c      18 Mar 2005 21:43:43 -0000      1.117
@@ -228,14 +228,17 @@
    /* Unmap the clients */
    MapUnmap(0);
 
-   ModulesSignal(ESIGNAL_INIT, NULL);
-
-   /* Move elsewhere... */
+   /* Move elsewhere? */
    HintsInit();
    CommsInit();
    SessionInit();
    LoadSnapInfo();
 
+   ModulesSignal(ESIGNAL_INIT, NULL);
+
+   /* retreive stuff from last time we were loaded if we're restarting */
+   EHintsGetMainInfo();
+
    /* Load the theme */
    ThemeConfigLoad();
 




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to