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

Revert my last proxy-related change.

Browse source 
2001-07-18  Richard Hestilow  <hestilow@ximian.com>

	* capplet-util.[ch]: Revert my last proxy-related change.
This commit is contained in:
Richard Hestilow 2001-07-18 18:50:44 +00:00 • committed by Rachel Hestilow
parent 59a807f174
commit cefd029e80
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
capplets/common/ChangeLog
View file

@ -1,3 +1,7 @@
2001-07-18 Richard Hestilow <hestilow@ximian.com>
* capplet-util.[ch]: Revert my last proxy-related change.
2001-07-18 Richard Hestilow <hestilow@ximian.com> 2001-07-18 Richard Hestilow <hestilow@ximian.com>
* capplet-util.h (CreateDialogFn): Add a PropertyBag argument so * capplet-util.h (CreateDialogFn): Add a PropertyBag argument so

7
capplets/common/capplet-util.c
View file

@ -146,15 +146,12 @@ get_control_cb (BonoboPropertyControl *property_control, gint page_number)
GtkWidget *pf; GtkWidget *pf;
if (control == NULL) { if (control == NULL) {
pf = bonobo_property_frame_new (NULL, NULL); widget = create_dialog_cb (void);
widget = create_dialog_cb (BONOBO_OBJREF (BONOBO_PROPERTY_FRAME (pf)->proxy));
if (widget == NULL) if (widget == NULL)
{
bonobo_object_unref (BONOBO_OBJECT (pf));
return NULL; return NULL;
}
pf = bonobo_property_frame_new (NULL, NULL);
gtk_object_set_data (GTK_OBJECT (property_control), gtk_object_set_data (GTK_OBJECT (property_control),
"property-frame", pf); "property-frame", pf);
gtk_container_add (GTK_CONTAINER (pf), widget); gtk_container_add (GTK_CONTAINER (pf), widget);

2
capplets/common/capplet-util.h
View file

@ -66,7 +66,7 @@
typedef void (*ApplySettingsFn) (Bonobo_ConfigDatabase db); typedef void (*ApplySettingsFn) (Bonobo_ConfigDatabase db);
/* Callback to set up the dialog proper */ /* 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 */ /* Callback to set up property editors for the dialog */
typedef void (*SetupPropertyEditorsFn) (GtkWidget *dialog, Bonobo_PropertyBag bag); typedef void (*SetupPropertyEditorsFn) (GtkWidget *dialog, Bonobo_PropertyBag bag);