[Opensync-commits] r5172 - plugins/google-calendar/src

[<dg...@su...>]

Author: savago
Date: Fri Jan 16 16:41:23 2009
New Revision: 5172
URL: http://www.opensync.org/changeset/5172

Log:
osync_objtype_sink_get_anchor cannot be called in initialize.

Modified:
   plugins/google-calendar/src/gcalendar.c

Modified: plugins/google-calendar/src/gcalendar.c
==============================================================================
--- plugins/google-calendar/src/gcalendar.c	Fri Jan 16 16:07:58 2009	(r5171)
+++ plugins/google-calendar/src/gcalendar.c	Fri Jan 16 16:41:23 2009	(r5172)
@@ -100,9 +100,6 @@
 	gcal_t contacts;
 	struct gcal_event_array all_events;
 	struct gcal_contact_array all_contacts;
-	/* anchor objects */
-	OSyncAnchor *gcontact_anchor;
-	OSyncAnchor *gcalendar_anchor;
 	/* calendar sink/format */
 	OSyncObjTypeSink *gcal_sink;
 	OSyncObjFormat *gcal_format;
@@ -217,8 +214,8 @@
 
 	if (!plgdata->gcal_sink)
 		return;
-	osync_assert(plgdata->gcalendar_anchor);
-	timestamp = osync_anchor_retrieve(plgdata->gcalendar_anchor, &anchor_error);
+	timestamp = osync_anchor_retrieve(osync_objtype_sink_get_anchor(plgdata->gcal_sink),
+					  &anchor_error);
 	if (timestamp)
 		osync_trace(TRACE_INTERNAL, "timestamp is: %s\n", timestamp);
 	else
@@ -367,8 +364,9 @@
 
 	if (!plgdata->gcont_sink)
 		return;
-	osync_assert(plgdata->gcontact_anchor);
-	timestamp = osync_anchor_retrieve(plgdata->gcontact_anchor, &anchor_error);
+
+	timestamp = osync_anchor_retrieve(osync_objtype_sink_get_anchor(plgdata->gcont_sink),
+					  &anchor_error);
 	if (timestamp)
 		osync_trace(TRACE_INTERNAL, "timestamp is: %s\n", timestamp);
 	else
@@ -737,17 +735,15 @@
 	if (plgdata->calendar && plgdata->cal_timestamp) {
 		osync_trace(TRACE_INTERNAL, "query updated timestamp: %s\n",
 				    plgdata->cal_timestamp);
-		osync_assert(plgdata->gcalendar_anchor);
-		osync_anchor_update(plgdata->gcalendar_anchor, plgdata->cal_timestamp,
-				    &anchor_error);
+		osync_anchor_update(osync_objtype_sink_get_anchor(plgdata->gcal_sink),
+				    plgdata->cal_timestamp, &anchor_error);
 	}
 
 	if (plgdata->contacts && plgdata->cont_timestamp) {
-		osync_assert(plgdata->gcontact_anchor);
 		osync_trace(TRACE_INTERNAL, "query updated timestamp: %s\n",
 				    plgdata->cont_timestamp);
-		osync_anchor_update(plgdata->gcontact_anchor, plgdata->cont_timestamp,
-				    &anchor_error);
+		osync_anchor_update(osync_objtype_sink_get_anchor(plgdata->gcont_sink),
+				    plgdata->cont_timestamp, &anchor_error);
 	}
 
 	osync_context_report_success(ctx);
@@ -880,11 +876,7 @@
 		osync_objtype_sink_set_functions(plgdata->gcal_sink, functions_gcal, plgdata);
 		osync_plugin_info_add_objtype(info, plgdata->gcal_sink);
 
-		osync_objtype_sink_enable_anchor(plgdata->gcal_sink, TRUE);
-		if (!(plgdata->gcalendar_anchor = osync_objtype_sink_get_anchor(plgdata->gcal_sink))) {
-			osync_trace(TRACE_ERROR, "%s", "Failed getting calendar anchor!");
-			goto error_freeplg;
-		}
+ 		osync_objtype_sink_enable_anchor(plgdata->gcal_sink, TRUE);
 	}
 
 	OSyncObjTypeSinkFunctions functions_gcont;
@@ -915,10 +907,6 @@
 		osync_plugin_info_add_objtype(info, plgdata->gcont_sink);
 
 		osync_objtype_sink_enable_anchor(plgdata->gcont_sink, TRUE);
-		if (!(plgdata->gcontact_anchor = osync_objtype_sink_get_anchor(plgdata->gcont_sink))) {
-			osync_trace(TRACE_ERROR, "%s", "Failed getting contact anchor!");
-			goto error_freeplg;
-		}
 	}
 
 	if (plgdata->calendar)