Update (main): Use a GtkDialog rather than a GnomeDialog; don't place a

2001-12-20  Bradford Hovinen  <hovinen@ximian.com>

	* *-properties*.c (dialog_button_clicked_cb): Update
	(main): Use a GtkDialog rather than a GnomeDialog; don't place a
	weak ref on gtk_main_quit

10 files changed, 91 insertions, 32 deletions

diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index 0e740060c..346c2d1c3 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,6 +1,9 @@
 2001-12-20  Bradford Hovinen  <hovinen@ximian.com>
 
 	* background-properties-capplet.c: Update
+	(main): Use a GtkDialog rather than a GnomeDialog
+	(main): Don't put weak ref on gtk_main_quit
+	(dialog_button_clicked_cb): Update
 
 	* Makefile.am: Update
 
diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am
index 496aa326c..7852e0fdd 100644
--- a/capplets/background/Makefile.am
+++ b/capplets/background/Makefile.am
@@ -11,6 +11,9 @@ Glade_DATA = background-properties.glade
 iconsdir   = $(GNOMECC_ICONS_DIR)
 icons_DATA = background-capplet.png
 
+desktopdir = $(GNOMECC_DESKTOP_DIR)
+desktop_DATA = background.desktop
+
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) -I$(top_srcdir)/libbackground
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
 EXTRA_DIST = $(Glade_DATA) $(icons_DATA)
diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c
index 2a02904b2..a77db0f67 100644
--- a/capplets/background/background-properties-capplet.c
+++ b/capplets/background/background-properties-capplet.c
@@ -265,12 +265,17 @@ create_dialog (BGApplier *bg_applier)
 /* Callback issued when a button is clicked on the dialog */
 
 static void
-dialog_button_clicked_cb (GnomeDialog *dialog, gint button_number, GConfChangeSet *changeset) 
+dialog_button_clicked_cb (GnomeDialog *dialog, gint response_id, GConfChangeSet *changeset) 
 {
-	if (button_number == 0)
+	switch (response_id) {
+	case GTK_RESPONSE_APPLY:
 		gconf_client_commit_change_set (gconf_client_get_default (), changeset, TRUE, NULL);
-	else if (button_number == 1)
-		gnome_dialog_close (dialog);
+		break;
+
+	case GTK_RESPONSE_CLOSE:
+		gtk_main_quit ();
+		break;
+	}
 }
 
 int
@@ -310,11 +315,16 @@ main (int argc, char **argv)
 		dialog = create_dialog (BG_APPLIER (bg_applier));
 		setup_dialog (dialog, changeset, BG_APPLIER (bg_applier));
 
-		dialog_win = gnome_dialog_new (_("Background properties"), GTK_STOCK_APPLY, GTK_STOCK_CLOSE, NULL);
-		g_signal_connect (G_OBJECT (dialog_win), "clicked", (GCallback) dialog_button_clicked_cb, changeset);
+		dialog_win = gtk_dialog_new_with_buttons
+			(_("Background properties"), NULL, -1,
+			 GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
+			 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+			 NULL);
+
+		g_signal_connect (G_OBJECT (dialog_win), "response", (GCallback) dialog_button_clicked_cb, changeset);
+
 		g_object_weak_ref (G_OBJECT (dialog_win), (GWeakNotify) g_object_unref, bg_applier);
-		g_object_weak_ref (G_OBJECT (dialog_win), (GWeakNotify) gtk_main_quit, NULL);
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, GNOME_PAD_SMALL);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, GNOME_PAD_SMALL);
 		gtk_widget_show_all (dialog_win);
 
 		gtk_main ();
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index 0213ffe0f..5c00a454f 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,5 +1,9 @@
 2001-12-20  Bradford Hovinen  <hovinen@ximian.com>
 
+	* keyboard-properties.c (dialog_button_clicked_cb): Update
+	(main): Use a GtkDialog rather than a GnomeDialog; don't place a
+	weak ref on gtk_main_quit
+
 	* Makefile.am: Update
 
 	* keyboard.desktop.in.in (Exec): Update
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index 3a0af1c3c..fa10ce317 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -11,6 +11,9 @@ Glade_DATA = keyboard-properties.glade
 iconsdir   = $(GNOMECC_ICONS_DIR)
 icons_DATA = keyboard-capplet.png
 
+desktopdir = $(GNOMECC_DESKTOP_DIR)
+desktop_DATA = keyboard.desktop
+
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
 EXTRA_DIST = $(Glade_DATA) $(icons_DATA)
diff --git a/capplets/keyboard/keyboard-properties.c b/capplets/keyboard/keyboard-properties.c
index 38cb00740..6721e886a 100644
--- a/capplets/keyboard/keyboard-properties.c
+++ b/capplets/keyboard/keyboard-properties.c
@@ -222,12 +222,17 @@ create_dialog (void)
 }
 
 static void
-dialog_button_clicked_cb (GnomeDialog *dialog, gint button_number, GConfChangeSet *changeset) 
+dialog_button_clicked_cb (GnomeDialog *dialog, gint response_id, GConfChangeSet *changeset) 
 {
-	if (button_number == 0)
+	switch (response_id) {
+	case GTK_RESPONSE_APPLY:
 		gconf_client_commit_change_set (gconf_client_get_default (), changeset, TRUE, NULL);
-	else if (button_number == 1)
-		gnome_dialog_close (dialog);
+		break;
+
+	case GTK_RESPONSE_CLOSE:
+		gtk_main_quit ();
+		break;
+	}
 }
 
 int
@@ -273,10 +278,14 @@ main (int argc, char **argv)
 			(GNOMECC_ICONS_DIR "keyboard-capplet.png");
 #endif
 
-		dialog_win = gnome_dialog_new (_("Keyboard properties"), GTK_STOCK_APPLY, GTK_STOCK_CLOSE, NULL);
-		g_signal_connect (G_OBJECT (dialog_win), "clicked", (GCallback) dialog_button_clicked_cb, changeset);
-		g_object_weak_ref (G_OBJECT (dialog_win), (GWeakNotify) gtk_main_quit, NULL);
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, GNOME_PAD_SMALL);
+		dialog_win = gtk_dialog_new_with_buttons
+			(_("Keyboard properties"), NULL, -1,
+			 GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
+			 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+			 NULL);
+
+		g_signal_connect (G_OBJECT (dialog_win), "response", (GCallback) dialog_button_clicked_cb, changeset);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, GNOME_PAD_SMALL);
 		gtk_widget_show_all (dialog_win);
 
 		gtk_main ();
diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index 9d2f086b9..472bdbc41 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-20  Bradford Hovinen  <hovinen@ximian.com>
+
+	* mouse-properties-capplet.c (dialog_button_clicked_cb): Update
+	(main): Use a GtkDialog rather than GnomeDialog; don't place weak
+	ref on gtk_main_quit
+
 2001-12-20  Hans Petter Jansson  <hpj@ximian.com>
 
 	* Makefile.am: Remove rule that prevented install.
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index ee6641c54..c925d5916 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -19,6 +19,9 @@ Glade_DATA = mouse-properties.glade
 iconsdir   = $(GNOMECC_ICONS_DIR)
 icons_DATA = mouse-capplet.png
 
+desktopdir = $(GNOMECC_DESKTOP_DIR)
+desktop_DATA = mouse.desktop
+
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
 EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(pixmap_DATA)
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index 9c2d0e75d..ebc06cf97 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -390,12 +390,17 @@ create_dialog (void)
 /* Callback issued when a button is clicked on the dialog */
 
 static void
-dialog_button_clicked_cb (GnomeDialog *dialog, gint button_number, GConfChangeSet *changeset) 
+dialog_button_clicked_cb (GnomeDialog *dialog, gint response_id, GConfChangeSet *changeset) 
 {
-	if (button_number == 0)
+	switch (response_id) {
+	case GTK_RESPONSE_APPLY:
 		gconf_client_commit_change_set (gconf_client_get_default (), changeset, TRUE, NULL);
-	else if (button_number == 1)
-		gnome_dialog_close (dialog);
+		break;
+
+	case GTK_RESPONSE_CLOSE:
+		gtk_main_quit ();
+		break;
+	}
 }
 
 int
@@ -433,10 +438,14 @@ main (int argc, char **argv)
 		load_pixbufs ();
 		setup_dialog (dialog, changeset);
 
-		dialog_win = gnome_dialog_new (_("Mouse properties"), GTK_STOCK_APPLY, GTK_STOCK_CLOSE, NULL);
-		g_signal_connect (G_OBJECT (dialog_win), "clicked", (GCallback) dialog_button_clicked_cb, changeset);
-		g_object_weak_ref (G_OBJECT (dialog_win), (GWeakNotify) gtk_main_quit, NULL);
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, GNOME_PAD_SMALL);
+		dialog_win = gtk_dialog_new_with_buttons
+			(_("Keyboard properties"), NULL, -1,
+			 GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
+			 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+			 NULL);
+
+		g_signal_connect (G_OBJECT (dialog_win), "response", (GCallback) dialog_button_clicked_cb, changeset);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, GNOME_PAD_SMALL);
 		gtk_widget_show_all (dialog_win);
 
 		gtk_main ();
diff --git a/capplets/mouse/mouse-properties-capplet.c b/capplets/mouse/mouse-properties-capplet.c
index 9c2d0e75d..ebc06cf97 100644
--- a/capplets/mouse/mouse-properties-capplet.c
+++ b/capplets/mouse/mouse-properties-capplet.c
@@ -390,12 +390,17 @@ create_dialog (void)
 /* Callback issued when a button is clicked on the dialog */
 
 static void
-dialog_button_clicked_cb (GnomeDialog *dialog, gint button_number, GConfChangeSet *changeset) 
+dialog_button_clicked_cb (GnomeDialog *dialog, gint response_id, GConfChangeSet *changeset) 
 {
-	if (button_number == 0)
+	switch (response_id) {
+	case GTK_RESPONSE_APPLY:
 		gconf_client_commit_change_set (gconf_client_get_default (), changeset, TRUE, NULL);
-	else if (button_number == 1)
-		gnome_dialog_close (dialog);
+		break;
+
+	case GTK_RESPONSE_CLOSE:
+		gtk_main_quit ();
+		break;
+	}
 }
 
 int
@@ -433,10 +438,14 @@ main (int argc, char **argv)
 		load_pixbufs ();
 		setup_dialog (dialog, changeset);
 
-		dialog_win = gnome_dialog_new (_("Mouse properties"), GTK_STOCK_APPLY, GTK_STOCK_CLOSE, NULL);
-		g_signal_connect (G_OBJECT (dialog_win), "clicked", (GCallback) dialog_button_clicked_cb, changeset);
-		g_object_weak_ref (G_OBJECT (dialog_win), (GWeakNotify) gtk_main_quit, NULL);
-		gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, GNOME_PAD_SMALL);
+		dialog_win = gtk_dialog_new_with_buttons
+			(_("Keyboard properties"), NULL, -1,
+			 GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
+			 GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+			 NULL);
+
+		g_signal_connect (G_OBJECT (dialog_win), "response", (GCallback) dialog_button_clicked_cb, changeset);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), WID ("prefs_widget"), TRUE, TRUE, GNOME_PAD_SMALL);
 		gtk_widget_show_all (dialog_win);
 
 		gtk_main ();