aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/evolution-shell-component-client.c8
2 files changed, 8 insertions, 6 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 878ead2a0a..da707efdeb 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-29 Dan Winship <danw@helixcode.com>
+
+ * evolution-shell-component-client.c
+ (evolution_shell_component_client_new): Update warning message to
+ not say "CRASHING", since it won't if you have current bonobo.
+
2000-06-29 Peter Williams <peter@beta.newton.cx>
* e-shell.c (e_shell_restore_from_settings): Check for the
diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c
index dd3bdb3c5d..b61fa1a351 100644
--- a/shell/evolution-shell-component-client.c
+++ b/shell/evolution-shell-component-client.c
@@ -359,12 +359,8 @@ evolution_shell_component_client_new (const char *id)
corba_object = activate_object_from_id (id);
if (corba_object == CORBA_OBJECT_NIL) {
- printf ("Could not activate component %s.\n"
- "(Maybe you need to set OAF_INFO_PATH?)\n"
- "CRASHING!\n", id);
- /* FIXME: This is not the right call here. It will SEGV
- * in Bonobo_Unknown_unref.
- */
+ g_warning ("Could not activate component %s. "
+ "(Maybe you need to set OAF_INFO_PATH?)", id);
bonobo_object_unref (BONOBO_OBJECT (new));
return NULL;
}