Fix startup trouble (again).

SVN revision: 12870

src/desktops.c

@@ -384,6 +384,10 @@ DeskCreate(int desk, int add_controls)
      {
 	EoSetFloating(d, 1);
 	EobjListStackAdd(&d->o, 0);
+#if 0				/* TBD */
+	d->event_mask = EDESK_EVENT_MASK;
+	DeskEventsConfigure(d, 1);
+#endif
      }
    EventCallbackRegister(win, 0, DesktopHandleEvents, d);
 
@@ -393,8 +397,6 @@ DeskCreate(int desk, int add_controls)
 	DeskControlsShow(d);
      }
 
-   DeskEventsConfigure(d, 1);
-
    {
       Background        **lst;
       int                 num;

src/main.c

@@ -234,9 +234,6 @@ main(int argc, char **argv)
    /* Unmap the clients */
    MapUnmap(0);
 
-   /* Flush (get rid of unmap events) */
-   XSync(disp, True);
-
    ModulesSignal(ESIGNAL_INIT, NULL);
 
    /* Move elsewhere... */

src/setup.c

@@ -69,6 +69,8 @@ MapUnmap(int start)
 		    }
 	       }
 	  }
+	/* Flush (get rid of unmap events) */
+	XSync(disp, True);
 	ecore_x_ungrab();
 	break;
      case 1: