diff options
Diffstat (limited to 'control-center')
| -rw-r--r-- | control-center/ChangeLog | 5 | ||||
| -rw-r--r-- | control-center/capplet-dir.c | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/control-center/ChangeLog b/control-center/ChangeLog index 4e5b3b963..0bd4b1c15 100644 --- a/control-center/ChangeLog +++ b/control-center/ChangeLog @@ -1,3 +1,8 @@ +2001-09-22 Bradford Hovinen <hovinen@ximian.com> + + * capplet-dir.c (capplet_control_launch): Create apply and close + buttons to match the setup tools + 2001-08-20 Bradford Hovinen <hovinen@ximian.com> * capplet-dir.c (capplet_control_launch): Update moniker being diff --git a/control-center/capplet-dir.c b/control-center/capplet-dir.c index 79ecf46f6..233429077 100644 --- a/control-center/capplet-dir.c +++ b/control-center/capplet-dir.c @@ -413,7 +413,7 @@ get_root_capplet_dir (void) } static void -capplet_ok_cb (GtkWidget *widget, GtkWidget *app) +capplet_apply_cb (GtkWidget *widget, GtkWidget *app) { CORBA_Environment ev; Bonobo_PropertyControl pc; @@ -422,15 +422,12 @@ capplet_ok_cb (GtkWidget *widget, GtkWidget *app) pc = gtk_object_get_data (GTK_OBJECT (app), "property-control"); Bonobo_PropertyControl_notifyAction (pc, 0, Bonobo_PropertyControl_APPLY, &ev); - gtk_widget_destroy (app); - - bonobo_object_release_unref (pc, &ev); CORBA_exception_free (&ev); } static void -capplet_cancel_cb (GtkWidget *widget, GtkWidget *app) +capplet_close_cb (GtkWidget *widget, GtkWidget *app) { CORBA_Environment ev; Bonobo_PropertyControl pc; @@ -502,8 +499,8 @@ capplet_control_launch (const gchar *capplet_name, gchar *window_title) return NULL; } - app = gnome_dialog_new (window_title, GNOME_STOCK_BUTTON_OK, - GNOME_STOCK_BUTTON_CANCEL, NULL); + app = gnome_dialog_new (window_title, GNOME_STOCK_BUTTON_APPLY, + GNOME_STOCK_BUTTON_CLOSE, NULL); gtk_object_set_data (GTK_OBJECT (app), "property-control", property_control); control = bonobo_widget_new_control_from_objref (control_ref, CORBA_OBJECT_NIL); @@ -526,8 +523,8 @@ capplet_control_launch (const gchar *capplet_name, gchar *window_title) bonobo_object_release_unref (property_control, &ev); app = NULL; } else { - gnome_dialog_button_connect (GNOME_DIALOG (app), 0, GTK_SIGNAL_FUNC (capplet_ok_cb), app); - gnome_dialog_button_connect (GNOME_DIALOG (app), 1, GTK_SIGNAL_FUNC (capplet_cancel_cb), app); + gnome_dialog_button_connect (GNOME_DIALOG (app), 0, GTK_SIGNAL_FUNC (capplet_apply_cb), app); + gnome_dialog_button_connect (GNOME_DIALOG (app), 1, GTK_SIGNAL_FUNC (capplet_close_cb), app); gtk_widget_show_all (app); } } |