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

Set moniker property manually (capplet_control_launch): Remove double-free

Browse source 
2001-07-24  Bradford Hovinen  <hovinen@ximian.com>

	* capplet-dir.c (capplet_control_launch): Set moniker property
	manually
	(capplet_control_launch): Remove double-free of the moniker
	(capplet_control_launch): Release and unref the property control
	in the event of an error
This commit is contained in:
Bradford Hovinen 2001-07-24 15:13:10 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent e9ab6d3ff0
commit 8b9b013e5b
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
control-center/ChangeLog
View file

@ -1,3 +1,11 @@
2001-07-24 Bradford Hovinen <hovinen@ximian.com>
* capplet-dir.c (capplet_control_launch): Set moniker property
manually
(capplet_control_launch): Remove double-free of the moniker
(capplet_control_launch): Release and unref the property control
in the event of an error
2001-07-23 Bradford Hovinen <hovinen@ximian.com>
* capplet-dir.c (capplet_control_launch): Put up an error dialog

26
control-center/capplet-dir.c
View file

@ -429,14 +429,20 @@ capplet_cancel_cb (GtkWidget *widget, GtkWidget *app)
GtkWidget *
capplet_control_launch (const gchar *capplet_name, gchar *window_title)
{
gchar *oaf_iid, *moniker;
gchar *tmp, *tmp1;
gchar *oaf_iid;
gchar *moniker;
gchar *tmp;
gchar *tmp1;
GtkWidget *app, *control;
CORBA_Environment ev;
GtkWidget *app;
GtkWidget *control;
CORBA_Environment ev;
Bonobo_PropertyControl property_control;
Bonobo_Control control_ref;
Bonobo_PropertyControl property_control;
Bonobo_Control control_ref;
Bonobo_PropertyBag pb;
BonoboControlFrame *cf;
g_return_val_if_fail (capplet_name != NULL, NULL);
@ -475,12 +481,14 @@ capplet_control_launch (const gchar *capplet_name, gchar *window_title)
if (control == NULL) {
g_critical ("Could not create widget from control");
gtk_widget_destroy (app);
g_free (moniker);
bonobo_object_release_unref (property_control, &ev);
app = NULL;
} else {
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (app)->vbox), control, TRUE, TRUE, 0);
bonobo_widget_set_property (BONOBO_WIDGET (control), "moniker", moniker, &ev);
cf = bonobo_widget_get_control_frame (BONOBO_WIDGET (control));
pb = bonobo_control_frame_get_control_property_bag (cf, &ev);
bonobo_property_bag_client_set_value_string (pb, "moniker", moniker, &ev);
if (BONOBO_EX (&ev)) {
GtkWidget *dialog;
@ -488,7 +496,7 @@ capplet_control_launch (const gchar *capplet_name, gchar *window_title)
dialog = gnome_error_dialog ("Could not load your configuration settings.");
gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
gtk_widget_destroy (app);
g_free (moniker);
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);