new method to delay showing a dialog until after the window manager is

        * delayed-dialog.c (gnome_settings_delayed_show_dialog): new
        method to delay showing a dialog until after the window manager is
        running.

        * gnome-settings-font.c (load_cursor):
        * gnome-settings-keyboard-xkb.c (activation_error): Use it.

6 files changed, 141 insertions, 6 deletions

diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 314989a85..9523a1e04 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-12  Dan Winship  <danw@novell.com>
+
+	* delayed-dialog.c (gnome_settings_delayed_show_dialog): new
+	method to delay showing a dialog until after the window manager is
+	running.
+
+	* gnome-settings-font.c (load_cursor): 
+	* gnome-settings-keyboard-xkb.c (activation_error): Use it.
+
 2006-08-24  Andre Klapper <a9016009@gmx.de>
 
 	Fixes #170318
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index e85d9684a..462ddacfd 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -62,7 +62,8 @@ gnome_settings_daemon_SOURCES =	\
 	xutils.c			\
 	xutils.h			\
 	clipboard-manager.c		\
-	clipboard-manager.h		
+	clipboard-manager.h		\
+	delayed-dialog.c
 
 #	$(AccessX_files)		
 
diff --git a/gnome-settings-daemon/delayed-dialog.c b/gnome-settings-daemon/delayed-dialog.c
new file mode 100644
index 000000000..46e9baf4d
--- /dev/null
+++ b/gnome-settings-daemon/delayed-dialog.c
@@ -0,0 +1,122 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "gnome-settings-daemon.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gdk/gdkx.h>
+
+static gboolean        delayed_show_timeout (gpointer   data);
+static GdkFilterReturn message_filter       (GdkXEvent *xevent,
+					     GdkEvent  *event,
+					     gpointer   data);
+
+static GSList *dialogs = NULL;
+
+/**
+ * gnome_settings_delayed_show_dialog:
+ * @dialog: the dialog
+ *
+ * Shows the dialog as with gtk_widget_show(), unless a window manager
+ * hasn't been started yet, in which case it will wait up to 5 seconds
+ * for that to happen before showing the dialog.
+ **/
+void
+gnome_settings_delayed_show_dialog (GtkWidget *dialog)
+{
+	GdkDisplay *display = gtk_widget_get_display (dialog);
+	Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+	GdkScreen *screen = gtk_widget_get_screen (dialog);
+	GdkAtom manager_atom;
+	char selection_name[10];
+	Atom selection_atom;
+
+	/* We can't use gdk_selection_owner_get() for this, because
+	 * it's an unknown out-of-process window.
+	 */
+	snprintf (selection_name, sizeof (selection_name), "WM_S%d",
+		  gdk_screen_get_number (screen));
+	selection_atom = XInternAtom (xdisplay, selection_name, True);
+	if (selection_atom &&
+	    XGetSelectionOwner (xdisplay, selection_atom) != None) {
+		gtk_widget_show (dialog);
+		return;
+	}
+
+	dialogs = g_slist_prepend (dialogs, dialog);
+
+	manager_atom = gdk_atom_intern ("MANAGER", FALSE);
+	gdk_display_add_client_message_filter (display, manager_atom,
+					       message_filter, NULL);
+
+	g_timeout_add (5000, delayed_show_timeout, NULL);
+}
+
+static gboolean
+delayed_show_timeout (gpointer data)
+{
+	GSList *l;
+
+	for (l = dialogs; l; l = l->next)
+		gtk_widget_show (l->data);
+	g_slist_free (dialogs);
+	dialogs = NULL;
+
+	/* FIXME: There's no gdk_display_remove_client_message_filter */
+
+	return FALSE;
+}
+
+static GdkFilterReturn
+message_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
+{
+	XClientMessageEvent *evt = (XClientMessageEvent *)xevent;
+	char *selection_name = XGetAtomName (evt->display, evt->data.l[1]);
+	int screen;
+	GSList *l, *next;
+
+	if (!dialogs)
+		return GDK_FILTER_CONTINUE;
+
+	if (strncmp (selection_name, "WM_S", 4) != 0) {
+		XFree (selection_name);
+		return GDK_FILTER_CONTINUE;
+	}
+
+	screen = atoi (selection_name + 4);
+
+	for (l = dialogs; l; l = next) {
+		GtkWidget *dialog = l->data;
+		next = l->next;
+
+		if (gdk_screen_get_number (gtk_widget_get_screen (dialog)) == screen) {
+			gtk_widget_show (dialog);
+			dialogs = g_slist_remove (dialogs, dialog);
+		}
+	}
+
+	if (!dialogs) {
+		/* FIXME: There's no gdk_display_remove_client_message_filter */
+	}
+
+	return GDK_FILTER_CONTINUE;	
+}
+
diff --git a/gnome-settings-daemon/gnome-settings-daemon.h b/gnome-settings-daemon/gnome-settings-daemon.h
index c4c7b1d21..3c2e70c5f 100644
--- a/gnome-settings-daemon/gnome-settings-daemon.h
+++ b/gnome-settings-daemon/gnome-settings-daemon.h
@@ -36,6 +36,7 @@ void       gnome_settings_daemon_register_callback (const char      *dir,
 						    KeyCallbackFunc  func);
 GtkWidget *gnome_settings_daemon_get_invisible     (void);
 
+void       gnome_settings_delayed_show_dialog      (GtkWidget       *dialog);
 
 G_BEGIN_DECLS
 
diff --git a/gnome-settings-daemon/gnome-settings-font.c b/gnome-settings-daemon/gnome-settings-font.c
index fd788f437..13f25aeae 100644
--- a/gnome-settings-daemon/gnome-settings-font.c
+++ b/gnome-settings-daemon/gnome-settings-font.c
@@ -74,8 +74,9 @@ load_cursor (GConfClient *client)
 					   _("Cannot create the directory \"%s\".\n"\
 					     "This is needed to allow changing the mouse pointer theme."),
 					   font_dir_name);
-	  gtk_dialog_run (GTK_DIALOG (dialog));
-	  gtk_widget_destroy (dialog);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);
+	  gnome_settings_delayed_show_dialog (dialog);
 	  g_free (font_dir_name);
 
 	  return;
@@ -96,8 +97,9 @@ load_cursor (GConfClient *client)
 					   (_("Cannot create the directory \"%s\".\n"\
 					      "This is needed to allow changing cursors.")),
 					   dir_name);
-	  gtk_dialog_run (GTK_DIALOG (dialog));
-	  gtk_widget_destroy (dialog);
+	  g_signal_connect (dialog, "response",
+			    G_CALLBACK (gtk_widget_destroy), NULL);
+	  gnome_settings_delayed_show_dialog (dialog);
 	  g_free (dir_name);
 
 	  return;
diff --git a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
index 5fd01cd49..00bc7cf16 100644
--- a/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
+++ b/gnome-settings-daemon/gnome-settings-keyboard-xkb.c
@@ -124,7 +124,7 @@ activation_error (void)
 						     "gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd");
 	g_signal_connect (dialog, "response",
 			  G_CALLBACK (gtk_widget_destroy), NULL);
-	gtk_widget_show (dialog);
+	gnome_settings_delayed_show_dialog (dialog);
 }
 
 static void