From 1dd4c2daa23218a3c48526aa8c8d7ec9bb8c0e89 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Sat, 22 Sep 2001 23:36:41 +0000 Subject: [PATCH] Create apply and close buttons, ala the setup tools 2001-09-14 Bradford Hovinen * rollback-capplet-dialog.c (rollback_capplet_dialog_init): Create apply and close buttons, ala the setup tools --- capplets/rollback/ChangeLog | 5 +++++ capplets/rollback/rollback-capplet-dialog.c | 22 +++++---------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/capplets/rollback/ChangeLog b/capplets/rollback/ChangeLog index a3c865df6..46f95f365 100644 --- a/capplets/rollback/ChangeLog +++ b/capplets/rollback/ChangeLog @@ -1,3 +1,8 @@ +2001-09-14 Bradford Hovinen + + * rollback-capplet-dialog.c (rollback_capplet_dialog_init): Create + apply and close buttons, ala the setup tools + 2001-07-27 Bradford Hovinen * RELEASE : 1.5.2 diff --git a/capplets/rollback/rollback-capplet-dialog.c b/capplets/rollback/rollback-capplet-dialog.c index 7e2c4c37a..a0e667219 100644 --- a/capplets/rollback/rollback-capplet-dialog.c +++ b/capplets/rollback/rollback-capplet-dialog.c @@ -101,11 +101,9 @@ static void mod_date_by_str (struct tm static void rollback_changed_cb (RollbackCappletDialog *dialog, GtkAdjustment *adj); -static void ok_cb (GtkButton *button, - RollbackCappletDialog *dialog); static void apply_cb (GtkButton *button, RollbackCappletDialog *dialog); -static void cancel_cb (GtkButton *button, +static void close_cb (GtkButton *button, RollbackCappletDialog *dialog); guint @@ -140,9 +138,8 @@ rollback_capplet_dialog_init (RollbackCappletDialog *dialog) GladeXML *data; static const gchar *buttons[] = { - GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_APPLY, - GNOME_STOCK_BUTTON_CANCEL, + GNOME_STOCK_BUTTON_CLOSE, NULL }; @@ -171,9 +168,8 @@ rollback_capplet_dialog_init (RollbackCappletDialog *dialog) gnome_dialog_constructv (GNOME_DIALOG (dialog), _("Rollback"), buttons); - gnome_dialog_button_connect (GNOME_DIALOG (dialog), 0, GTK_SIGNAL_FUNC (ok_cb), dialog); - gnome_dialog_button_connect (GNOME_DIALOG (dialog), 1, GTK_SIGNAL_FUNC (apply_cb), dialog); - gnome_dialog_button_connect (GNOME_DIALOG (dialog), 2, GTK_SIGNAL_FUNC (cancel_cb), dialog); + gnome_dialog_button_connect (GNOME_DIALOG (dialog), 0, GTK_SIGNAL_FUNC (apply_cb), dialog); + gnome_dialog_button_connect (GNOME_DIALOG (dialog), 1, GTK_SIGNAL_FUNC (close_cb), dialog); } static void @@ -583,14 +579,6 @@ rollback_changed_cb (RollbackCappletDialog *dialog, CORBA_exception_free (&ev); } -static void -ok_cb (GtkButton *button, RollbackCappletDialog *dialog) -{ - apply_settings (dialog); - - gnome_dialog_close (GNOME_DIALOG (dialog)); -} - static void apply_cb (GtkButton *button, RollbackCappletDialog *dialog) { @@ -598,7 +586,7 @@ apply_cb (GtkButton *button, RollbackCappletDialog *dialog) } static void -cancel_cb (GtkButton *button, RollbackCappletDialog *dialog) +close_cb (GtkButton *button, RollbackCappletDialog *dialog) { gnome_dialog_close (GNOME_DIALOG (dialog)); }