[evolution-data-server/libgdata-port] Updated to use libgdata 0.2.0 API

[Philip Withnall <pwithnall src gnome org>]

commit 3754aea4ca2a52895fed947870b6b4927eff7118
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Apr 25 16:25:10 2009 +0100

    Updated to use libgdata 0.2.0 API
    
    Updated the Google Contacts and Calendar backends to use only API in libgdata
    0.2.0 (some functions were renamed). Also removed some trailing whitespace
    and unused code.
---
 addressbook/backends/google/google-book.c          |    2 +-
 .../backends/google/e-cal-backend-google-utils.c   |   13 ++++---------
 calendar/backends/google/e-cal-backend-google.c    |   14 ++------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/addressbook/backends/google/google-book.c b/addressbook/backends/google/google-book.c
index 6cc6812..879a522 100644
--- a/addressbook/backends/google/google-book.c
+++ b/addressbook/backends/google/google-book.c
@@ -748,7 +748,7 @@ proxy_settings_changed (EProxy *proxy, gpointer user_data)
 	if (e_proxy_require_proxy_for_uri (proxy, priv->base_uri)) {
 		proxy_uri = e_proxy_peek_uri_for (proxy, priv->base_uri);
 	}
-	gdata_service_set_proxy (GDATA_SERVICE (priv->service), proxy_uri);
+	gdata_service_set_proxy_uri (GDATA_SERVICE (priv->service), proxy_uri);
 }
 
 gboolean
diff --git a/calendar/backends/google/e-cal-backend-google-utils.c b/calendar/backends/google/e-cal-backend-google-utils.c
index 12dedd3..5c9e074 100644
--- a/calendar/backends/google/e-cal-backend-google-utils.c
+++ b/calendar/backends/google/e-cal-backend-google-utils.c
@@ -21,7 +21,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -57,10 +56,6 @@
 #include "e-cal-backend-google.h"
 #include "e-cal-backend-google-utils.h"
 
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
 #define CACHE_REFRESH_INTERVAL 10000
 
 /****************************************************** Google Connection Helper Functions ***********************************************/
@@ -506,12 +501,12 @@ e_go_item_to_cal_component (EGoItem *item, ECalBackendGoogle *cbgo)
 		if (go_attendee->rel) {
 			gchar *val;
 			val = strstr ((const gchar *)go_attendee->rel, (const gchar *)"organizer");
-			if (val != NULL && !strcmp ("organizer", val)) {	
-				org = g_new0 (ECalComponentOrganizer, 1);	
+			if (val != NULL && !strcmp ("organizer", val)) {
+				org = g_new0 (ECalComponentOrganizer, 1);
 
-				if (go_attendee->email) 
+				if (go_attendee->email)
 					org->value = g_strconcat ("MAILTO:", go_attendee->email, NULL);
-				if (go_attendee->value_string) 
+				if (go_attendee->value_string)
 					org->cn = g_strdup (go_attendee->value_string);
 			}	
 		}
diff --git a/calendar/backends/google/e-cal-backend-google.c b/calendar/backends/google/e-cal-backend-google.c
index 37f6e99..278300a 100644
--- a/calendar/backends/google/e-cal-backend-google.c
+++ b/calendar/backends/google/e-cal-backend-google.c
@@ -83,15 +83,6 @@ struct _ECalBackendGooglePrivate {
 	EProxy *proxy;
 };
 
-gint compare_ids (gconstpointer cache_id, gconstpointer modified_cache_id);
-gchar * form_query (const char *query);
-
-gint
-compare_ids (gconstpointer cache_id, gconstpointer modified_cache_id)
-{
-	return strcmp (cache_id, modified_cache_id);
-}
-
 /************************************************** Calendar Backend Methods **********************************/
 
 static ECalBackendSyncStatus
@@ -1308,7 +1299,7 @@ proxy_settings_changed (EProxy *proxy, gpointer user_data)
 	if (e_proxy_require_proxy_for_uri (proxy, priv->uri)) {
 		proxy_uri = e_proxy_peek_uri_for (proxy, priv->uri);
 	}
-	gdata_service_set_proxy (GDATA_SERVICE (priv->service), proxy_uri);
+	gdata_service_set_proxy_uri (GDATA_SERVICE (priv->service), proxy_uri);
 }
  
 /* Object initialisation function for google backend */
@@ -1501,7 +1492,7 @@ e_cal_backend_google_set_uri (ECalBackendGoogle *cbgo, gchar *uri)
 		proxy_uri = e_proxy_peek_uri_for (priv->proxy, priv->uri);
 	}
 
-	gdata_service_set_proxy (GDATA_SERVICE (priv->service), proxy_uri);
+	gdata_service_set_proxy_uri (GDATA_SERVICE (priv->service), proxy_uri);
 }
 
 /**
@@ -1595,7 +1586,6 @@ e_cal_backend_google_get_cache (ECalBackendGoogle *cbgo)
 	g_return_val_if_fail (cbgo != NULL, NULL);
 	g_return_val_if_fail (E_IS_CAL_BACKEND_GOOGLE(cbgo), NULL);
 
-
 	priv = cbgo->priv;
 	return priv->cache;
 }