aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/comp-util.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b2c8997191..a0d7dd3768 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-06 Chenthill Palanisamy <pchenthill@novell.com>
+
+ Fixes #162005
+ * gui/comp-util.c: (cal_comp_is_on_server): Pass the recurrence
+ id to find if the object is on the server.
+
2006-04-05 Simon Zheng <simon.zheng@sun.com>
Fixes bug #333704
@@ -12837,3 +12843,4 @@
* gui/e-tasks.c (e_tasks_delete_completed): no need to do the
expunge asyn
+
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index fad01446da..32257b6be9 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -205,7 +205,7 @@ cal_comp_util_compare_event_timezones (ECalComponent *comp,
gboolean
cal_comp_is_on_server (ECalComponent *comp, ECal *client)
{
- const char *uid;
+ const char *uid, *rid;
icalcomponent *icalcomp;
GError *error = NULL;
@@ -221,8 +221,9 @@ cal_comp_is_on_server (ECalComponent *comp, ECal *client)
* the user.
*/
e_cal_component_get_uid (comp, &uid);
+ rid = e_cal_component_get_recurid_as_string (comp);
- if (e_cal_get_object (client, uid, NULL, &icalcomp, &error)) {
+ if (e_cal_get_object (client, uid, rid, &icalcomp, &error)) {
icalcomponent_free (icalcomp);
return TRUE;