aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Alves <alves@src.gnome.org>2000-06-14 12:19:29 +0800
committerSeth Alves <alves@src.gnome.org>2000-06-14 12:19:29 +0800
commit73358f50a1915292dea968fcb9101438f38b7243 (patch)
treec9066f3100c97649a4e6e150b9094ce2ebf1d22c
parenta304d8390786c44bbd6add534371ce2f076fac5b (diff)
downloadgsoc2013-evolution-73358f50a1915292dea968fcb9101438f38b7243.tar
gsoc2013-evolution-73358f50a1915292dea968fcb9101438f38b7243.tar.gz
gsoc2013-evolution-73358f50a1915292dea968fcb9101438f38b7243.tar.bz2
gsoc2013-evolution-73358f50a1915292dea968fcb9101438f38b7243.tar.lz
gsoc2013-evolution-73358f50a1915292dea968fcb9101438f38b7243.tar.xz
gsoc2013-evolution-73358f50a1915292dea968fcb9101438f38b7243.tar.zst
gsoc2013-evolution-73358f50a1915292dea968fcb9101438f38b7243.zip
finish switch back to vcal
svn path=/trunk/; revision=3556
-rw-r--r--calendar/cal-client/cal-client.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index 921e2dac59..258a7852e2 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -606,9 +606,6 @@ cal_client_get_object (CalClient *client, const char *uid, iCalObject **ico)
Evolution_Calendar_CalObj calobj;
char *obj_str = NULL;
- icalcomponent* comp = NULL;
- icalcomponent *subcomp;
- iCalObject *ical;
g_return_val_if_fail (client != NULL, CAL_CLIENT_GET_SYNTAX_ERROR);
g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_GET_SYNTAX_ERROR);
@@ -637,6 +634,11 @@ cal_client_get_object (CalClient *client, const char *uid, iCalObject **ico)
decode:
CORBA_exception_free (&ev);
+#if 0
+ icalcomponent* comp = NULL;
+ icalcomponent *subcomp;
+ iCalObject *ical;
+
/* convert the string into an iCalObject */
(*ico) = NULL;
if (obj_str == NULL) return CAL_CLIENT_GET_SYNTAX_ERROR;
@@ -662,6 +664,10 @@ cal_client_get_object (CalClient *client, const char *uid, iCalObject **ico)
subcomp = icalcomponent_get_next_component (comp,
ICAL_ANY_COMPONENT);
}
+# else /* 0 */
+ ical_object_find_in_string (uid, obj_str, ico);
+
+# endif /* 0 */
return CAL_CLIENT_GET_NOT_FOUND;
}