Initial hint setup tweaks.

SVN revision: 13784

src/E.h

@@ -1819,6 +1819,7 @@ void                HintsGetWindowHints(EWin * ewin);
 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);

src/desktops.c

@@ -431,6 +431,8 @@ DeskCreate(int desk, int add_controls)
 	}
    }
 
+   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 @@ DesksInit(void)
 
    for (i = 0; i < Conf.desks.num; i++)
       DeskCreate(i, 0);
+
+   HintsSetDesktopConfig();
 }
 
 void

src/ewmh.c

@@ -154,12 +154,6 @@ EWMH_Init(Window win_wm_check)
 
    /* 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();
 }
 
 /*

src/gnome.c

@@ -725,9 +725,6 @@ GNOME_SetHints(Window win_wm_check)
 {
    GNOME_SetWMNameVer();
    GNOME_SetUsedHints();
-   GNOME_SetDeskCount();
-   GNOME_SetDeskNames();
-   GNOME_SetAreaCount();
    GNOME_SetWMCheck(win_wm_check);
    {
       Atom                atom_set;

src/hints.c

@@ -37,9 +37,6 @@ HintsInit(void)
 
    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);
@@ -51,6 +48,12 @@ HintsInit(void)
    ecore_x_window_prop_string_set(VRoot.win, atom, e_wm_version);
 }
 
+void
+HintsSetRootHints(Window win __UNUSED__)
+{
+   /* Nothing done here for now */
+}
+
 void
 HintsSetClientList(void)
 {

src/main.c

@@ -228,14 +228,17 @@ main(int argc, char **argv)
    /* 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();