aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/calendar-component.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 71953bf0b7..e6930b7ae8 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-29 Dan Winship <danw@ximian.com>
+
+ * gui/calendar-component.c (impl_createControls): set an exception
+ if we fail, so evo won't crash.
+
2003-10-29 <jpr@ximian.com>
* gui/dialogs/cal-prefs-dialog.c (update_config): no need to
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 619d15493b..e929e0db24 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -276,6 +276,9 @@ impl_createControls (PortableServer_Servant servant,
priv->calendar = GNOME_CALENDAR (gnome_calendar_new ());
if (!priv->calendar) {
g_warning (G_STRLOC ": could not create the calendar widget!");
+ CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
+ ex_GNOME_Evolution_Component_Failed,
+ NULL);
return;
}
@@ -284,6 +287,9 @@ impl_createControls (PortableServer_Servant servant,
view_control = bonobo_control_new (GTK_WIDGET (priv->calendar));
if (!view_control) {
g_warning (G_STRLOC ": could not create the control!");
+ CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
+ ex_GNOME_Evolution_Component_Failed,
+ NULL);
return;
}
g_object_set_data (G_OBJECT (priv->calendar), "control", view_control);