--- a/ChangeLog	Tue Aug 16 02:10:03 2005 +0000
+++ b/ChangeLog	Tue Aug 16 02:15:23 2005 +0000
@@ -1,3 +1,19 @@
+2005-08-15  Laszlo Peter  <[email protected]>
+
+	* control-center.spec:
+	* patches/control-center-14-read-alert-dialog.diff:
+	* patches/control-center-14-wall.diff:
+	* patches/control-center-15-menu-reorder.diff:
+	* patches/control-center-15-no-xkb-dialog.diff:
+	* patches/control-center-16-layout-deletion.diff:
+	* patches/control-center-16-wall.diff:
+	* patches/control-center-17-background-crash.diff:
+	* patches/control-center-17-no-xkb-dialog.diff:
+	* patches/control-center-18-layout-deletion.diff:
+	* patches/control-center-18-xkb-check-remote-login.diff:
+	* patches/control-center-19-background-crash.diff:
+	* patches/control-center-20-xkb-check-remote-login.diff:
+
 2005-08-16  Glynn Foster  <[email protected]>
 
 	* pango.spec: Bump to 1.10.0

--- a/control-center.spec	Tue Aug 16 02:10:03 2005 +0000
+++ b/control-center.spec	Tue Aug 16 02:15:23 2005 +0000
@@ -46,13 +46,11 @@
 Patch11:      control-center-11-settings-daemon-per-display.diff
 Patch12:      control-center-12-homefolder-keybindings.diff
 Patch13:      control-center-13-anykey-grab.diff
-Patch14:      control-center-14-read-alert-dialog.diff
-Patch15:      control-center-15-menu-reorder.diff
-Patch16:      control-center-16-wall.diff
-Patch17:      control-center-17-no-xkb-dialog.diff
-Patch18:      control-center-18-layout-deletion.diff
-Patch19:      control-center-19-background-crash.diff
-Patch20:      control-center-20-xkb-check-remote-login.diff
+Patch14:      control-center-14-wall.diff
+Patch15:      control-center-15-no-xkb-dialog.diff
+Patch16:      control-center-16-layout-deletion.diff
+Patch17:      control-center-17-background-crash.diff
+Patch18:      control-center-18-xkb-check-remote-login.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -116,15 +114,13 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%ifos solaris
 %patch14 -p1
+%endif
 %patch15 -p1
-%ifos solaris
 %patch16 -p1
-%endif
 %patch17 -p1
 %patch18 -p1
-%patch19 -p1
-%patch20 -p1
 
 
 %build
@@ -236,6 +232,9 @@
 
 
 %changelog
+* Mon Aug 15 2005 - [email protected]
+- remove patches read-alert-dialog.diff (reported in bugzilla #172090) and
+  menu-reorder.diff. Renumber patches.
 * Mon Aug 15 2005 - [email protected]
 - Bump to 2.11.91.
 

--- a/patches/control-center-14-read-alert-dialog.diff	Tue Aug 16 02:10:03 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- control-center-2.10.1/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c	Thu May 12 16:46:31 2005
-+++ control-center-2.10.1-new/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c	Fri May 13 15:55:41 2005
-@@ -382,6 +382,8 @@ warning_dialog_post (GtkWidget *dialog, 
- 						      GTK_STOCK_OK,
- 						      GTK_RESPONSE_OK,
- 						      NULL);
-+		atk_object_set_role (gtk_widget_get_accessible (GTK_WIDGET (dialog)),
-+				     ATK_ROLE_ALERT);
- 		g_signal_connect (G_OBJECT (dialog),
- 				  "response",
- 				  G_CALLBACK (response),

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-14-wall.diff	Tue Aug 16 02:15:23 2005 +0000
@@ -0,0 +1,31 @@
+--- control-center-2.10.1/libgswitchit/Makefile.am-orig	2005-05-29 09:28:40.289189000 -0500
++++ control-center-2.10.1/libgswitchit/Makefile.am	2005-05-29 09:28:52.681359000 -0500
+@@ -1,5 +1,5 @@
+ INCLUDES = 						\
+-	-Wall -I$(top_srcdir)			\
++	-I$(top_srcdir)					\
+ 	$(GNOME_CFLAGS)					\
+ 	$(GNOME_DESKTOP_CFLAGS)				\
+ 	$(LIBXKLAVIER_CFLAGS)				\
+--- control-center-2.10.1/libkbdraw/Makefile.am-orig	2005-05-29 09:35:26.281753000 -0500
++++ control-center-2.10.1/libkbdraw/Makefile.am	2005-05-29 09:35:38.899096000 -0500
+@@ -17,7 +17,7 @@
+ ## 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+ ##
+ 
+-AM_CFLAGS = $(GTK_CFLAGS) -Wall -Werror
++AM_CFLAGS = $(GTK_CFLAGS)
+ 
+ noinst_LIBRARIES = libkbdraw.a
+ libkbdraw_a_SOURCES = keyboard-marshal.c keyboard-marshal.h \
+--- control-center-2.10.1/capplets/keyboard/Makefile.am-orig	2005-05-29 09:48:55.013889000 -0500
++++ control-center-2.10.1/capplets/keyboard/Makefile.am	2005-05-29 09:49:05.076187000 -0500
+@@ -11,7 +11,7 @@ gnome_keyboard_properties_LDADD =				\
+ 	../accessibility/keyboard/libaccessibility-keyboard.a 	\
+ 	$(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \
+ 	../../libgswitchit/libgswitchit.a \
+-	../../libkbdraw/libkbdraw.a
++	../../libkbdraw/libkbdraw.a -lfontconfig
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 

--- a/patches/control-center-15-menu-reorder.diff	Tue Aug 16 02:10:03 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-diff -urN control-center-2.10.1/capplets/font/font-properties.desktop.in.in control-center-2.10.1-hacked/capplets/font/font-properties.desktop.in.in
---- control-center-2.10.1/capplets/font/font-properties.desktop.in.in	2004-11-25 07:54:02.000000000 +1300
-+++ control-center-2.10.1-hacked/capplets/font/font-properties.desktop.in.in	2005-05-14 11:04:12.179424960 +1200
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Font
-+_Name=Fonts
- _Comment=Select fonts for the desktop
- Exec=gnome-font-properties
- Icon=gnome-settings-font
-diff -urN control-center-2.10.1/capplets/keybindings/keybinding.desktop.in.in control-center-2.10.1-hacked/capplets/keybindings/keybinding.desktop.in.in
---- control-center-2.10.1/capplets/keybindings/keybinding.desktop.in.in	2004-11-25 07:54:02.000000000 +1300
-+++ control-center-2.10.1-hacked/capplets/keybindings/keybinding.desktop.in.in	2005-05-14 11:02:39.502513992 +1200
-@@ -1,13 +1,13 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Keyboard Shortcuts
-+_Name=Shortcuts
- _Comment=Assign shortcut keys to commands
- Exec=gnome-keybinding-properties
- Icon=gnome-settings-keybindings
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;Keyboard;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center
-diff -urN control-center-2.10.1/capplets/keyboard/gnome-keyboard-properties.glade control-center-2.10.1-hacked/capplets/keyboard/gnome-keyboard-properties.glade
---- control-center-2.10.1/capplets/keyboard/gnome-keyboard-properties.glade	2005-01-20 12:16:13.000000000 +1300
-+++ control-center-2.10.1-hacked/capplets/keyboard/gnome-keyboard-properties.glade	2005-05-14 11:01:36.804045608 +1200
-@@ -5,7 +5,7 @@
- 
- <widget class="GtkDialog" id="keyboard_dialog">
-   <property name="border_width">6</property>
--  <property name="title" translatable="yes">Keyboard Preferences</property>
-+  <property name="title" translatable="yes">Keyboard Behavior</property>
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_NONE</property>
-   <property name="modal">False</property>
-diff -urN control-center-2.10.1/capplets/keyboard/keyboard.desktop.in.in control-center-2.10.1-hacked/capplets/keyboard/keyboard.desktop.in.in
---- control-center-2.10.1/capplets/keyboard/keyboard.desktop.in.in	2004-11-25 07:54:03.000000000 +1300
-+++ control-center-2.10.1-hacked/capplets/keyboard/keyboard.desktop.in.in	2005-05-14 11:02:26.334515832 +1200
-@@ -1,13 +1,13 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Keyboard
--_Comment=Set your keyboard preferences
-+_Name=Behavior
-+_Comment=Set your keyboard behavior
- Exec=gnome-keyboard-properties
- Icon=gnome-dev-keyboard
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;Keyboard;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center
-diff -urN control-center-2.10.1/capplets/theme-switcher/gtk-theme-selector.desktop.in.in control-center-2.10.1-hacked/capplets/theme-switcher/gtk-theme-selector.desktop.in.in
---- control-center-2.10.1/capplets/theme-switcher/gtk-theme-selector.desktop.in.in	2004-11-25 07:54:03.000000000 +1300
-+++ control-center-2.10.1-hacked/capplets/theme-switcher/gtk-theme-selector.desktop.in.in	2005-05-14 11:02:03.166037976 +1200
-@@ -7,7 +7,7 @@
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;Appearance;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center
-diff -urN control-center-2.10.1/capplets/ui-properties/gnome-ui-properties.desktop.in.in control-center-2.10.1-hacked/capplets/ui-properties/gnome-ui-properties.desktop.in.in
---- control-center-2.10.1/capplets/ui-properties/gnome-ui-properties.desktop.in.in	2004-11-25 07:54:03.000000000 +1300
-+++ control-center-2.10.1-hacked/capplets/ui-properties/gnome-ui-properties.desktop.in.in	2005-05-14 11:03:02.087080616 +1200
-@@ -7,7 +7,7 @@
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;Appearance;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center
-diff -urN control-center-2.10.1/capplets/windows/window-properties.desktop.in.in control-center-2.10.1-hacked/capplets/windows/window-properties.desktop.in.in
---- control-center-2.10.1/capplets/windows/window-properties.desktop.in.in	2004-12-16 02:58:56.000000000 +1300
-+++ control-center-2.10.1-hacked/capplets/windows/window-properties.desktop.in.in	2005-05-14 11:03:37.445705288 +1200
-@@ -1,13 +1,13 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=Windows
--_Comment=Set your window properties
-+_Name=Window Behavior
-+_Comment=Set your window behavior preferences
- Exec=gnome-window-properties
- Icon=gnome-window-manager
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;Application;Settings;
-+Categories=GNOME;Application;Settings;Appearance;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=control-center

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-15-no-xkb-dialog.diff	Tue Aug 16 02:15:23 2005 +0000
@@ -0,0 +1,12 @@
+--- control-center-2.10.1/gnome-settings-daemon/gnome-settings-keyboard-xkb.c	2005-03-01 04:34:52.000000000 +0530
++++ control-center-2.10.1-new/gnome-settings-daemon/gnome-settings-keyboard-xkb.c	2005-08-04 21:14:48.638271752 +0530
+@@ -169,7 +169,8 @@ apply_xkb_settings (void)
+ 			}
+ 		} else {
+ 			g_warning ("Could not activate the XKB configuration");
+-			activation_error ();
++			initedOk = FALSE;
++			return;
+ 		}
+ 	} else
+ 		XklDebug (100, "Actual KBD configuration was not changed: redundant notification\n");

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-16-layout-deletion.diff	Tue Aug 16 02:15:23 2005 +0000
@@ -0,0 +1,13 @@
+--- control-center-2.10.1/capplets/keyboard/gnome-keyboard-properties-xkblt.c	2005-02-09 04:12:10.000000000 +0530
++++ control-center-2.10.1-new/capplets/keyboard/gnome-keyboard-properties-xkblt.c	2005-08-04 21:28:23.665368800 +0530
+@@ -195,7 +195,9 @@ xkb_layouts_enable_disable_buttons (Glad
+   gtk_widget_set_sensitive (addLayoutBtn,
+ 			    (nSelectedLayouts < maxSelectedLayouts ||
+ 				maxSelectedLayouts == 0));
+-  gtk_widget_set_sensitive (delLayoutBtn, nSelectedSelectedLayouts > 0);
++  gtk_widget_set_sensitive (delLayoutBtn,
++			    (nSelectedLayouts > 1)
++			    && (nSelectedSelectedLayouts > 0));
+ 
+   if (gtk_tree_selection_get_selected (sSelection, NULL, &iter))
+     {

--- a/patches/control-center-16-wall.diff	Tue Aug 16 02:10:03 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
---- control-center-2.10.1/libgswitchit/Makefile.am-orig	2005-05-29 09:28:40.289189000 -0500
-+++ control-center-2.10.1/libgswitchit/Makefile.am	2005-05-29 09:28:52.681359000 -0500
-@@ -1,5 +1,5 @@
- INCLUDES = 						\
--	-Wall -I$(top_srcdir)			\
-+	-I$(top_srcdir)					\
- 	$(GNOME_CFLAGS)					\
- 	$(GNOME_DESKTOP_CFLAGS)				\
- 	$(LIBXKLAVIER_CFLAGS)				\
---- control-center-2.10.1/libkbdraw/Makefile.am-orig	2005-05-29 09:35:26.281753000 -0500
-+++ control-center-2.10.1/libkbdraw/Makefile.am	2005-05-29 09:35:38.899096000 -0500
-@@ -17,7 +17,7 @@
- ## 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- ##
- 
--AM_CFLAGS = $(GTK_CFLAGS) -Wall -Werror
-+AM_CFLAGS = $(GTK_CFLAGS)
- 
- noinst_LIBRARIES = libkbdraw.a
- libkbdraw_a_SOURCES = keyboard-marshal.c keyboard-marshal.h \
---- control-center-2.10.1/capplets/keyboard/Makefile.am-orig	2005-05-29 09:48:55.013889000 -0500
-+++ control-center-2.10.1/capplets/keyboard/Makefile.am	2005-05-29 09:49:05.076187000 -0500
-@@ -11,7 +11,7 @@ gnome_keyboard_properties_LDADD =				\
- 	../accessibility/keyboard/libaccessibility-keyboard.a 	\
- 	$(GNOMECC_CAPPLETS_LIBS) $(LIBXKLAVIER_LIBS) \
- 	../../libgswitchit/libgswitchit.a \
--	../../libkbdraw/libkbdraw.a
-+	../../libkbdraw/libkbdraw.a -lfontconfig
- 
- @INTLTOOL_DESKTOP_RULE@
- 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-17-background-crash.diff	Tue Aug 16 02:15:23 2005 +0000
@@ -0,0 +1,26 @@
+--- control-center-2.6.1/capplets/background/gnome-wp-capplet.c	2005-05-26 10:15:18.000000000 +0530
++++ control-center-2.6.1-new/capplets/background/gnome-wp-capplet.c	2005-05-26 20:57:04.954778712 +0530
+@@ -552,6 +552,14 @@ void gnome_wp_main_quit (GnomeWPCapplet 
+     gtk_main_quit ();
+ }
+ 
++static gboolean wallpaper_properties_closed (GtkWidget * dialog,
++					     GdkEventAny *event,
++					     GnomeWPCapplet * capplet) {
++    gtk_widget_destroy (dialog);
++    gnome_wp_main_quit (capplet);
++    return FALSE;
++}
++
+ static void wallpaper_properties_clicked (GtkWidget * dialog,
+ 					  gint response_id,
+ 					  GnomeWPCapplet * capplet) {
+@@ -1520,6 +1528,8 @@ static void wallpaper_properties_init (v
+   g_signal_connect (G_OBJECT (capplet->window), "response",
+ 		    G_CALLBACK (wallpaper_properties_clicked), capplet);
+ 
++  g_signal_connect (G_OBJECT (capplet->window), "delete_event",
++		     G_CALLBACK (wallpaper_properties_closed), capplet);
+   gtk_widget_show (capplet->window);
+ 
+   cursor = gdk_cursor_new_for_display (gdk_display_get_default (),

--- a/patches/control-center-17-no-xkb-dialog.diff	Tue Aug 16 02:10:03 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- control-center-2.10.1/gnome-settings-daemon/gnome-settings-keyboard-xkb.c	2005-03-01 04:34:52.000000000 +0530
-+++ control-center-2.10.1-new/gnome-settings-daemon/gnome-settings-keyboard-xkb.c	2005-08-04 21:14:48.638271752 +0530
-@@ -169,7 +169,8 @@ apply_xkb_settings (void)
- 			}
- 		} else {
- 			g_warning ("Could not activate the XKB configuration");
--			activation_error ();
-+			initedOk = FALSE;
-+			return;
- 		}
- 	} else
- 		XklDebug (100, "Actual KBD configuration was not changed: redundant notification\n");

--- a/patches/control-center-18-layout-deletion.diff	Tue Aug 16 02:10:03 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- control-center-2.10.1/capplets/keyboard/gnome-keyboard-properties-xkblt.c	2005-02-09 04:12:10.000000000 +0530
-+++ control-center-2.10.1-new/capplets/keyboard/gnome-keyboard-properties-xkblt.c	2005-08-04 21:28:23.665368800 +0530
-@@ -195,7 +195,9 @@ xkb_layouts_enable_disable_buttons (Glad
-   gtk_widget_set_sensitive (addLayoutBtn,
- 			    (nSelectedLayouts < maxSelectedLayouts ||
- 				maxSelectedLayouts == 0));
--  gtk_widget_set_sensitive (delLayoutBtn, nSelectedSelectedLayouts > 0);
-+  gtk_widget_set_sensitive (delLayoutBtn,
-+			    (nSelectedLayouts > 1)
-+			    && (nSelectedSelectedLayouts > 0));
- 
-   if (gtk_tree_selection_get_selected (sSelection, NULL, &iter))
-     {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/control-center-18-xkb-check-remote-login.diff	Tue Aug 16 02:15:23 2005 +0000
@@ -0,0 +1,69 @@
+--- control-center-2.10.1/gnome-settings-daemon/gnome-settings-daemon.c	2005-08-04 21:11:38.050245536 +0530
++++ control-center-2.10.1-new/gnome-settings-daemon/gnome-settings-daemon.c	2005-08-04 22:03:37.678989880 +0530
+@@ -217,6 +217,22 @@ gnome_settings_daemon_init (GnomeSetting
+ BONOBO_TYPE_FUNC_FULL(GnomeSettingsDaemon, GNOME_SettingsDaemon,
+ 		      BONOBO_TYPE_OBJECT, gnome_settings_daemon)
+ 
++static gboolean
++is_xserver_local (void)
++{
++  const char *dt_xserver_loc;
++  const char *gdm_xserver_loc;
++
++  dt_xserver_loc = g_getenv ("DTXSERVERLOCATION");
++  gdm_xserver_loc = g_getenv ("GDM_XSERVER_LOCATION");
++
++  if ((dt_xserver_loc && strcmp (dt_xserver_loc, "remote") == 0) ||
++      (gdm_xserver_loc && strcmp (gdm_xserver_loc, "xdmcp") == 0))
++        return FALSE;
++
++  return TRUE;
++}
++
+ GObject *
+ gnome_settings_daemon_new (void)
+ {
+@@ -287,7 +303,7 @@ gnome_settings_daemon_new (void)
+ * disables the XKB layout support for Gnome when running Xsun
+ * with +xkb enabled */
+ 
+- if (!xserver_is_sun) {
++ if (!xserver_is_sun && is_xserver_local ()) {
+     gnome_settings_keyboard_xkb_set_post_activation_callback ((PostActivationCallback)gnome_settings_load_modmap_files, NULL);
+     gnome_settings_keyboard_xkb_init (client);
+   }
+--- control-center-2.10.1/capplets/keyboard/gnome-keyboard-properties.c	2005-08-04 21:11:38.031248424 +0530
++++ control-center-2.10.1-new/capplets/keyboard/gnome-keyboard-properties.c	2005-08-04 22:06:58.939393648 +0530
+@@ -99,6 +99,23 @@ CheckXKB (void)
+ 	return FALSE;
+ }
+ 
++static gboolean
++is_xserver_local (void)
++{
++	const char *dt_xserver_loc;
++	const char *gdm_xserver_loc;
++
++	dt_xserver_loc = g_getenv ("DTXSERVERLOCATION");
++	gdm_xserver_loc = g_getenv ("GDM_XSERVER_LOCATION");
++
++	if ((dt_xserver_loc && strcmp (dt_xserver_loc, "remote") == 0) ||
++	    (gdm_xserver_loc && strcmp (gdm_xserver_loc, "xdmcp") == 0)) {
++		return FALSE;
++	}
++
++	return TRUE;
++}
++
+ static GladeXML *
+ create_dialog (void)
+ {
+@@ -309,7 +326,7 @@ main (int argc, char **argv) 
+ 		get_legacy_settings ();
+ 	} else {
+ 		changeset = NULL;
+-		check_xkb_support = CheckXKB ();
++		check_xkb_support = is_xserver_local () && CheckXKB ();
+ 		dialog = create_dialog ();
+ 		setup_dialog (dialog, changeset);
+ 		if (switch_to_typing_break_page) {

--- a/patches/control-center-19-background-crash.diff	Tue Aug 16 02:10:03 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- control-center-2.6.1/capplets/background/gnome-wp-capplet.c	2005-05-26 10:15:18.000000000 +0530
-+++ control-center-2.6.1-new/capplets/background/gnome-wp-capplet.c	2005-05-26 20:57:04.954778712 +0530
-@@ -552,6 +552,14 @@ void gnome_wp_main_quit (GnomeWPCapplet 
-     gtk_main_quit ();
- }
- 
-+static gboolean wallpaper_properties_closed (GtkWidget * dialog,
-+					     GdkEventAny *event,
-+					     GnomeWPCapplet * capplet) {
-+    gtk_widget_destroy (dialog);
-+    gnome_wp_main_quit (capplet);
-+    return FALSE;
-+}
-+
- static void wallpaper_properties_clicked (GtkWidget * dialog,
- 					  gint response_id,
- 					  GnomeWPCapplet * capplet) {
-@@ -1520,6 +1528,8 @@ static void wallpaper_properties_init (v
-   g_signal_connect (G_OBJECT (capplet->window), "response",
- 		    G_CALLBACK (wallpaper_properties_clicked), capplet);
- 
-+  g_signal_connect (G_OBJECT (capplet->window), "delete_event",
-+		     G_CALLBACK (wallpaper_properties_closed), capplet);
-   gtk_widget_show (capplet->window);
- 
-   cursor = gdk_cursor_new_for_display (gdk_display_get_default (),

--- a/patches/control-center-20-xkb-check-remote-login.diff	Tue Aug 16 02:10:03 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
---- control-center-2.10.1/gnome-settings-daemon/gnome-settings-daemon.c	2005-08-04 21:11:38.050245536 +0530
-+++ control-center-2.10.1-new/gnome-settings-daemon/gnome-settings-daemon.c	2005-08-04 22:03:37.678989880 +0530
-@@ -217,6 +217,22 @@ gnome_settings_daemon_init (GnomeSetting
- BONOBO_TYPE_FUNC_FULL(GnomeSettingsDaemon, GNOME_SettingsDaemon,
- 		      BONOBO_TYPE_OBJECT, gnome_settings_daemon)
- 
-+static gboolean
-+is_xserver_local (void)
-+{
-+  const char *dt_xserver_loc;
-+  const char *gdm_xserver_loc;
-+
-+  dt_xserver_loc = g_getenv ("DTXSERVERLOCATION");
-+  gdm_xserver_loc = g_getenv ("GDM_XSERVER_LOCATION");
-+
-+  if ((dt_xserver_loc && strcmp (dt_xserver_loc, "remote") == 0) ||
-+      (gdm_xserver_loc && strcmp (gdm_xserver_loc, "xdmcp") == 0))
-+        return FALSE;
-+
-+  return TRUE;
-+}
-+
- GObject *
- gnome_settings_daemon_new (void)
- {
-@@ -287,7 +303,7 @@ gnome_settings_daemon_new (void)
- * disables the XKB layout support for Gnome when running Xsun
- * with +xkb enabled */
- 
-- if (!xserver_is_sun) {
-+ if (!xserver_is_sun && is_xserver_local ()) {
-     gnome_settings_keyboard_xkb_set_post_activation_callback ((PostActivationCallback)gnome_settings_load_modmap_files, NULL);
-     gnome_settings_keyboard_xkb_init (client);
-   }
---- control-center-2.10.1/capplets/keyboard/gnome-keyboard-properties.c	2005-08-04 21:11:38.031248424 +0530
-+++ control-center-2.10.1-new/capplets/keyboard/gnome-keyboard-properties.c	2005-08-04 22:06:58.939393648 +0530
-@@ -99,6 +99,23 @@ CheckXKB (void)
- 	return FALSE;
- }
- 
-+static gboolean
-+is_xserver_local (void)
-+{
-+	const char *dt_xserver_loc;
-+	const char *gdm_xserver_loc;
-+
-+	dt_xserver_loc = g_getenv ("DTXSERVERLOCATION");
-+	gdm_xserver_loc = g_getenv ("GDM_XSERVER_LOCATION");
-+
-+	if ((dt_xserver_loc && strcmp (dt_xserver_loc, "remote") == 0) ||
-+	    (gdm_xserver_loc && strcmp (gdm_xserver_loc, "xdmcp") == 0)) {
-+		return FALSE;
-+	}
-+
-+	return TRUE;
-+}
-+
- static GladeXML *
- create_dialog (void)
- {
-@@ -309,7 +326,7 @@ main (int argc, char **argv) 
- 		get_legacy_settings ();
- 	} else {
- 		changeset = NULL;
--		check_xkb_support = CheckXKB ();
-+		check_xkb_support = is_xserver_local () && CheckXKB ();
- 		dialog = create_dialog ();
- 		setup_dialog (dialog, changeset);
- 		if (switch_to_typing_break_page) {