Changeset 2616

Timestamp:

08/03/07 13:21:43 (6 years ago)

Author:

chris

Message:

Check for existence of ECalComponentId

Location:

trunk/src/target/OM-2007.2/libraries/libmokojournal2

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (1 diff)
• mokojournal/moko-journal.c (modified) (2 diffs)

trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog

@@ +1 @@
+2007-08-03  Chris Lord,,,  <chris@openedhand.com>
+
+        * configure.ac:
+        * mokojournal/moko-journal.c: (on_entries_removed_cb):
+        Check for existence of ECalComponentId
+
 2007-07-29  Holger Freyther  <zecke@selfish.org>
 

trunk/src/target/OM-2007.2/libraries/libmokojournal2/configure.ac

@@ -15 +15 @@
 # base deps
 PKG_CHECK_MODULES(DEPS, libecal-1.2 >= $LIBECAL_VERSION)
+
+# Check for existence of ECalComponentId
+old_cflags=$CFLAGS
+CFLAGS=$DEPS_CFLAGS
+AC_CHECK_TYPE(ECalComponentId, [], [], [#include <libecal/e-cal.h>])
+
+if test $ac_cv_type_ECalComponentId = yes; then
+        AC_DEFINE(HAVE_ECALCOMPONENTID, 1, [Defined if ECalComponentId exists])
+fi
+CFLAGS=$old_cflags
 
 if test x$MOKO_DEVEL = xon ; then

trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c

@@ -25 +25 @@
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-component.h>
+#ifdef HAVE_CONFIG
+#  include <config.h>
+#endif
 #include "moko-journal.h"
 #include "moko-time-priv.h"
@@ -1450 +1453 @@
   for (cur = a_uids ; cur ; cur = cur->next)
   {
-    if (cur->data)
-    {
-      if (!moko_journal_remove_entry_by_uid (a_journal, cur->data))
-      {
-        g_message ("failed to remove entry of uid %s\n",
-                   (const char*)cur->data) ;
-      }
+    const gchar *uid;
+          
+#ifdef HAVE_ECALCOMPONENTID
+    ECalComponentId *id = cur->data;
+    uid = id->uid;
+#else
+    uid = cur->data;
+#endif
+
+    if (!moko_journal_remove_entry_by_uid (a_journal, uid))
+    {
+      g_message ("failed to remove entry of uid %s\n", uid) ;
     }
   }