2007-07-04 Matthew Allum <[email protected]>

        * src/matchbox-keyboard-ui.c: (mb_kbd_ui_resources_create):
        Hack to avoid starting before EWMH window manager is started
        (only in daemon mode)


git-svn-id: https://svn.o-hand.com/repos/matchbox/trunk/matchbox-keyboard@1583 b067294f-1dea-0310-9683-c47a78595994

ChangeLog

@@ -1,3 +1,9 @@
+2007-07-04  Matthew Allum  <[email protected]>
+
+	* src/matchbox-keyboard-ui.c: (mb_kbd_ui_resources_create):
+	Hack to avoid starting before EWMH window manager is started
+	(only in daemon mode)
+
 2007-06-10  Matthew Allum  <[email protected]>
 
 	* README:

src/matchbox-keyboard-ui.c

@@ -679,11 +679,26 @@ mb_kbd_ui_resources_create(MBKeyboardUI  *ui)
     {
       have_ewmh_wm = True; 	/* basically assumed to be Metacity
 				   or at least only tested with mcity */
+    }
+  else
+    {
+      if (ui->is_daemon)
+	{
+	  /* Hack to avoid starting before the WM. Needed only in daemon mode
+	  */
+	  while (wm_name == NULL)
+	    {
+	      sleep(1);
+	      wm_name = get_current_window_manager_name(ui);
+	    }
 
-      if (streq(wm_name, "matchbox"))
-	have_matchbox_wm = True;
+	  have_ewmh_wm = True;
+	}
     }
 
+  if (wm_name && streq(wm_name, "matchbox"))
+    have_matchbox_wm = True;
+
   win_attr.override_redirect = False; /* Set to true for extreme case */
   win_attr.event_mask 
     = ButtonPressMask|ButtonReleaseMask|Button1MotionMask|StructureNotifyMask;