applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Bradford Hovinen 2001-12-20 18:21:12 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent cb0a578f7e
commit 2dd5ccf964
10 changed files with 91 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
capplets/keyboard/ChangeLog
View file

@ -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

3
capplets/keyboard/Makefile.am
View file

@ -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)

25
capplets/keyboard/keyboard-properties.c
View file

@ -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 ();