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

Set InvalidValue exception if the program could not resolve the moniker

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

	* capplet-util.c (set_moniker_cb): Set InvalidValue exception if
	the program could not resolve the moniker

	* capplet-dir.c (capplet_control_launch): Put up an error dialog
	and abort the process if the capplet reports an error trying to
	resolve its moniker
This commit is contained in:
Bradford Hovinen 2001-07-23 22:58:32 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 0e9e3ca1a2
commit 8d99fd960e
4 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
capplets/common/ChangeLog
View file

@ -1,7 +1,7 @@
2001-07-23 Bradford Hovinen <hovinen@ximian.com> 2001-07-23 Bradford Hovinen <hovinen@ximian.com>
* capplet-util.c (set_moniker_cb): Put up error dialog if we could * capplet-util.c (set_moniker_cb): Set InvalidValue exception if
not resolve the configuration moniker the program could not resolve the moniker
2001-07-20 Chema Celorio <chema@celorio.com> 2001-07-20 Chema Celorio <chema@celorio.com>

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

@ -124,8 +124,10 @@ set_moniker_cb (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id,
pf = BONOBO_PROPERTY_FRAME (bonobo_control_get_widget (control)); pf = BONOBO_PROPERTY_FRAME (bonobo_control_get_widget (control));
bonobo_property_frame_set_moniker (pf, full_moniker); bonobo_property_frame_set_moniker (pf, full_moniker);
if (pf->proxy->bag == CORBA_OBJECT_NIL) if (pf->proxy->bag == CORBA_OBJECT_NIL) {
gnome_error_dialog ("Could not load your configuration settings."); bonobo_exception_set (ev, ex_Bonobo_Property_InvalidValue);
return;
}
proxy = BONOBO_OBJREF (pf->proxy); proxy = BONOBO_OBJREF (pf->proxy);

6
control-center/ChangeLog
View file

@ -1,3 +1,9 @@
2001-07-23 Bradford Hovinen <hovinen@ximian.com>
* capplet-dir.c (capplet_control_launch): Put up an error dialog
and abort the process if the capplet reports an error trying to
resolve its moniker
2001-07-20 Chema Celorio <chema@celorio.com> 2001-07-20 Chema Celorio <chema@celorio.com>
* RELEASE : 1.5.0 * RELEASE : 1.5.0

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

@ -480,9 +480,19 @@ capplet_control_launch (const gchar *capplet_name, gchar *window_title)
} else { } else {
gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (app)->vbox), control, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (app)->vbox), control, TRUE, TRUE, 0);
bonobo_widget_set_property (BONOBO_WIDGET (control), "moniker", moniker, NULL); bonobo_widget_set_property (BONOBO_WIDGET (control), "moniker", moniker, &ev);
gtk_widget_show_all (app); if (BONOBO_EX (&ev)) {
GtkWidget *dialog;
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);
app = NULL;
} else {
gtk_widget_show_all (app);
}
} }
gnome_dialog_button_connect (GNOME_DIALOG (app), 0, GTK_SIGNAL_FUNC (capplet_ok_cb), app); gnome_dialog_button_connect (GNOME_DIALOG (app), 0, GTK_SIGNAL_FUNC (capplet_ok_cb), app);