aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog13
-rw-r--r--calendar/gui/calendar-component.c6
-rw-r--r--calendar/gui/calendar-config.c4
3 files changed, 19 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 316567d8e6..ba848437e5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,16 @@
+2003-12-14 JP Rosevear <jpr@ximian.com>
+
+ * gui/calendar-component.c (impl_requestCreateItem): set a proper
+ exception if we fail
+
+2003-12-14 JP Rosevear <jpr@ximian.com>
+
+ * gui/calendar-config.c
+ (calendar_config_get_hide_completed_tasks_units): make sure the
+ string is non-null before strcmp'ing it
+
+ Fixes #52033
+
2003-12-10 Rodrigo Moya <rodrigo@ximian.com>
* gui/gnome-cal.c (gnome_calendar_add_event_uri): remove the client
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 455ede19ba..1cad66d98c 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -755,9 +755,11 @@ impl_requestCreateItem (PortableServer_Servant servant,
priv = calendar_component->priv;
- if (!setup_create_ecal (calendar_component))
+ if (!setup_create_ecal (calendar_component)) {
+ bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
return;
-
+ }
+
editor = event_editor_new (priv->create_ecal);
if (strcmp (item_type_name, CREATE_EVENT_ID) == 0) {
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 3c12c381ac..fea9311b2c 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -622,9 +622,9 @@ calendar_config_get_hide_completed_tasks_units (void)
units = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_UNITS, NULL);
- if (!strcmp (units, "minutes"))
+ if (units && !strcmp (units, "minutes"))
cu = CAL_MINUTES;
- else if (!strcmp (units, "hours"))
+ else if (units && !strcmp (units, "hours"))
cu = CAL_HOURS;
else
cu = CAL_DAYS;