diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/Makefile.am | 2 | ||||
| -rw-r--r-- | shell/e-shell-settings-dialog.c | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 50f2629688..75a40b2769 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,8 @@ +2002-03-26 Ettore Perazzoli <ettore@ximian.com> + + * e-shell-settings-dialog.c (load_pages): g_warning if the control + cannot be activated. + 2002-03-25 Dan Winship <danw@ximian.com> * e-shell.c (e_shell_construct): Register a "working" folder type diff --git a/shell/Makefile.am b/shell/Makefile.am index 31cb6321e5..b403bbec3e 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -100,6 +100,8 @@ bin_PROGRAMS = evolution evolution_SOURCES = \ e-activity-handler.c \ e-activity-handler.h \ + e-component-info.c \ + e-component-info.h \ e-component-registry.c \ e-component-registry.h \ e-corba-config-page.c \ diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index 33a4613c91..76cf594ea4 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -34,6 +34,7 @@ #include <gal/util/e-util.h> #include <bonobo/bonobo-widget.h> +#include <bonobo/bonobo-exception.h> #include <liboaf/liboaf.h> #include <string.h> @@ -91,10 +92,13 @@ load_pages (EShellSettingsDialog *dialog) } corba_object = oaf_activate_from_id ((char *) info->iid, 0, NULL, &ev); - if (ev._major == CORBA_NO_EXCEPTION) + if (! BONOBO_EX (&ev)) { e_multi_config_dialog_add_page (E_MULTI_CONFIG_DIALOG (dialog), title, description, icon, E_CONFIG_PAGE (e_corba_config_page_new_from_objref (corba_object))); + } else { + g_warning ("Cannot activate %s -- %s", info->iid, BONOBO_EX_ID (&ev)); + } if (icon != NULL) gdk_pixbuf_unref (icon); |