2006-07-15 Glynn Foster <
[email protected]>
* control-center.spec: Update.
* patches/control-center-04-keyboard-layout.diff,
* patches/control-center-06-xkb-workaround.diff,
* patches/control-center-14-no-xkb-dialog.diff,
* patches/control-center-17-xkb-check-remote-login.diff:
Remove these keyboard layout patches to be replaced with
a single patch that removes the layout functionality.
This affects both the gnome-settings-daemon and the
keyboard preference dialog.
* control-center-04-remove-xkb-layout.diff: Add new patch.
* control-center-*.diff: Rename the rest.
--- 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 (),