evolution-data-server r8652 - trunk/calendar/backends/google

[ebbyw svn gnome org]

Author: ebbyw
Date: Wed Apr 16 21:57:27 2008
New Revision: 8652
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8652&view=rev

Log:
2008-04-16  Ebby wiselyn <ebbyw gnome org> ** Fix for bug #523630
	
	* backends/google/e-cal-backend-google.c: Error handling changes 


Modified:
   trunk/calendar/backends/google/e-cal-backend-google.c

Modified: trunk/calendar/backends/google/e-cal-backend-google.c
==============================================================================
--- trunk/calendar/backends/google/e-cal-backend-google.c	(original)
+++ trunk/calendar/backends/google/e-cal-backend-google.c	Wed Apr 16 21:57:27 2008
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Authors :
- *  Ebby Wiselyn <ebbywiselyn gmail com>
+ *  Ebby Wiselyn <ebbyw gnome org>
  *
  * Copyright 2007, Novell, Inc.
  *
@@ -539,7 +539,7 @@
 {
 	ECalBackendGooglePrivate *priv;
 	EGoItem *item = NULL;
-	GDataEntry *entry = NULL;
+	GDataEntry *entry = NULL, *updated_entry = NULL;
 	ECalComponent *comp, *modif_comp;
 	GSList *comps = NULL, *l = NULL;
 	icalproperty_method method;
@@ -577,11 +577,15 @@
 	if (!GDATA_IS_ENTRY(entry))
 		return GNOME_Evolution_Calendar_InvalidObject;	
 
-	gdata_service_insert_entry (GDATA_SERVICE(priv->service), priv->uri, entry);
+	updated_entry = gdata_service_insert_entry (GDATA_SERVICE(priv->service), priv->uri, entry, NULL);
+
+	if (updated_entry) {
+		/* FIXME */
+		g_object_unref (updated_entry);	
+	}
 
 	/* Update the Cache */
 
-	/* FIXME get the modified entry after insertion*/
 	modif_comp = g_object_ref (comp);
 	if (instances) {
 		const char *uid;
@@ -886,7 +890,7 @@
 	ECalComponent *comp = NULL, *cache_comp = NULL;
 	EGoItem *item;
 	const char *uid=NULL, *rid=NULL;
-	GDataEntry *entry, *entry_from_server=NULL;
+	GDataEntry *entry, *entry_from_server=NULL, *updated_entry=NULL;
 	gchar *edit_link;
 	GSList *l;
 
@@ -923,7 +927,7 @@
 			}
 
 			item = e_go_item_from_cal_component (cbgo, comp);
-			item->feed = gdata_service_get_feed (GDATA_SERVICE(priv->service), priv->uri);
+			item->feed = gdata_service_get_feed (GDATA_SERVICE(priv->service), priv->uri, NULL);
 			entry = item->entry;
 
 			if (!item->feed) {
@@ -941,7 +945,15 @@
 			}
 
 			edit_link = gdata_entry_get_edit_link (entry_from_server);
-			gdata_service_update_entry_with_link (GDATA_SERVICE (priv->service), entry, edit_link);
+			updated_entry = gdata_service_update_entry_with_link (GDATA_SERVICE (priv->service), 
+					entry, edit_link, NULL);
+
+			if (updated_entry) {
+				/* FIXME Response from server contains, additional info about GDataEntry 
+				 * Store and use them later
+				 */
+			}
+
 			break;
 		case CAL_MODE_LOCAL:
 			e_cal_backend_cache_put_component (priv->cache, comp);
@@ -978,7 +990,7 @@
 
 	*old_object = *object = NULL;
 	/* FIXME */
-	item->feed = gdata_service_get_feed (GDATA_SERVICE(priv->service), priv->uri);
+	item->feed = gdata_service_get_feed (GDATA_SERVICE(priv->service), priv->uri, NULL);
 
 	entries = gdata_feed_get_entries (item->feed);
 
@@ -1023,7 +1035,7 @@
 			return GNOME_Evolution_Calendar_InvalidObject;
 		}
 
-	        gdata_service_delete_entry (GDATA_SERVICE(priv->service), entry);
+	        gdata_service_delete_entry (GDATA_SERVICE(priv->service), entry, NULL);
 		*object = NULL;
 		*old_object = strdup (calobj);
 	}
@@ -1081,7 +1093,8 @@
 			item = e_go_item_from_cal_component (cbgo, comp);
 			entry = e_go_item_get_entry (item);
 
-			updated_entry = gdata_service_insert_entry (GDATA_SERVICE(priv->service), priv->uri, entry);
+			updated_entry = gdata_service_insert_entry (GDATA_SERVICE(priv->service),
+					priv->uri, entry, NULL);
 			if (!GDATA_IS_ENTRY (updated_entry)) {
 				g_message ("\n Entry Insertion Failed %s \n", G_STRLOC);
 			}