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

Add a PropertyBag argument so capplet authors can hook up to the proxy.

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

	* capplet-util.h (CreateDialogFn): Add a PropertyBag argument so
	capplet authors can hook up to the proxy.

	* capplet-util.c (get_control_cb): Pass the proxy bag to setup_cb.
	(capplet_init): Don't free default_moniker until after we print it.
This commit is contained in:
Richard Hestilow 2001-07-18 16:08:32 +00:00 • committed by Rachel Hestilow
parent 71eeb1347e
commit 3181b13b99
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
capplets/common/ChangeLog
View file

@ -1,3 +1,11 @@
2001-07-18 Richard Hestilow <hestilow@ximian.com>
* capplet-util.h (CreateDialogFn): Add a PropertyBag argument so
capplet authors can hook up to the proxy.
* capplet-util.c (get_control_cb): Pass the proxy bag to setup_cb.
(capplet_init): Don't free default_moniker until after we print it.
2001-07-17 Bradford Hovinen <hovinen@ximian.com>
* capplet-util.c (capplet_init): Support --init-session-settings

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

@ -146,12 +146,15 @@ get_control_cb (BonoboPropertyControl *property_control, gint page_number)
GtkWidget *pf;
if (control == NULL) {
widget = create_dialog_cb ();
pf = bonobo_property_frame_new (NULL, NULL);
widget = create_dialog_cb (BONOBO_OBJREF (BONOBO_PROPERTY_FRAME (pf)->proxy));
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);
@ -385,12 +388,12 @@ capplet_init (int argc,
default_moniker = get_default_moniker (argv[0]);
db = bonobo_get_object (default_moniker, "IDL:Bonobo/ConfigDatabase:1.0", &ev);
g_free (default_moniker);
if (db == CORBA_OBJECT_NIL) {
g_critical ("Cannot open configuration database %s", default_moniker);
g_free (default_moniker);
exit (-1);
}
g_free (default_moniker);
if ((apply_only || init_session) && apply_fn != NULL) {
apply_fn (db);

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

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