From cefd029e800f59ef18ae66e03e07c5c3097dbdaf Mon Sep 17 00:00:00 2001 From: Richard Hestilow Date: Wed, 18 Jul 2001 18:50:44 +0000 Subject: [PATCH] Revert my last proxy-related change. 2001-07-18 Richard Hestilow * capplet-util.[ch]: Revert my last proxy-related change. --- capplets/common/ChangeLog | 4 ++++ capplets/common/capplet-util.c | 7 ++----- capplets/common/capplet-util.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index c2a9fb4ad..05489a26f 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,7 @@ +2001-07-18 Richard Hestilow + + * capplet-util.[ch]: Revert my last proxy-related change. + 2001-07-18 Richard Hestilow * capplet-util.h (CreateDialogFn): Add a PropertyBag argument so diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c index 69212ff83..a59ac5656 100644 --- a/capplets/common/capplet-util.c +++ b/capplets/common/capplet-util.c @@ -146,15 +146,12 @@ get_control_cb (BonoboPropertyControl *property_control, gint page_number) GtkWidget *pf; if (control == NULL) { - pf = bonobo_property_frame_new (NULL, NULL); - widget = create_dialog_cb (BONOBO_OBJREF (BONOBO_PROPERTY_FRAME (pf)->proxy)); + widget = create_dialog_cb (void); if (widget == NULL) - { - bonobo_object_unref (BONOBO_OBJECT (pf)); return NULL; - } + pf = bonobo_property_frame_new (NULL, NULL); gtk_object_set_data (GTK_OBJECT (property_control), "property-frame", pf); gtk_container_add (GTK_CONTAINER (pf), widget); diff --git a/capplets/common/capplet-util.h b/capplets/common/capplet-util.h index 122b0e77f..eecf54cd1 100644 --- a/capplets/common/capplet-util.h +++ b/capplets/common/capplet-util.h @@ -66,7 +66,7 @@ typedef void (*ApplySettingsFn) (Bonobo_ConfigDatabase db); /* Callback to set up the dialog proper */ -typedef GtkWidget *(*CreateDialogFn) (Bonobo_PropertyBag bag); +typedef GtkWidget *(*CreateDialogFn) (void); /* Callback to set up property editors for the dialog */ typedef void (*SetupPropertyEditorsFn) (GtkWidget *dialog, Bonobo_PropertyBag bag);