aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/pcs/query.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 164084bcf4..67264d9e35 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-17 Rodrigo Moya <rodrigo@ximian.com>
+
+ * pcs/query.c (match_component): there may be cases when the backend
+ will return an invalid component from a valid UID (an UID returned
+ by the get_uids method), so don't abort if that's the case
+
2001-10-15 Damon Chaplin <damon@ximian.com>
* gui/dialogs/cal-prefs-dialog.glade: removed Help button. Do we have
diff --git a/calendar/pcs/query.c b/calendar/pcs/query.c
index 8ae9cfa697..0fd8a8a847 100644
--- a/calendar/pcs/query.c
+++ b/calendar/pcs/query.c
@@ -1116,7 +1116,7 @@ match_component (Query *query, const char *uid,
return;
comp = cal_backend_get_object_component (priv->backend, uid);
- g_assert (comp != NULL);
+ g_return_if_fail (comp != NULL);
gtk_object_ref (GTK_OBJECT (comp));
/* Eval the sexp */