evolution-mapi r93 - in trunk/src: camel libexchangemapi

[msuman svn gnome org]

Author: msuman
Date: Mon Feb  2 05:15:27 2009
New Revision: 93
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=93&view=rev

Log:
Part of fix for bug #568554 (Fix compiler warnings introduced after the libical fork was dropped).

Modified:
   trunk/src/camel/ChangeLog
   trunk/src/camel/camel-mapi-store.c
   trunk/src/libexchangemapi/ChangeLog
   trunk/src/libexchangemapi/exchange-mapi-cal-tz-utils.c

Modified: trunk/src/camel/camel-mapi-store.c
==============================================================================
--- trunk/src/camel/camel-mapi-store.c	(original)
+++ trunk/src/camel/camel-mapi-store.c	Mon Feb  2 05:15:27 2009
@@ -1258,13 +1258,14 @@
 	CamelMapiStore *mapi_store = CAMEL_MAPI_STORE (store);
 
 	CamelFolderInfo *fi;
-	CamelStoreInfo *si;
+	CamelStoreInfo *si = NULL;
 	gchar *parent_name = NULL;
 	gchar *f_name = NULL;
 	CamelURL *url;
 	/* TODO : exchange_mapi_add_to_favorites (); */
 
-	if (si = camel_store_summary_path((CamelStoreSummary *)mapi_store->summary, folder_name)) {
+	si = camel_store_summary_path((CamelStoreSummary *)mapi_store->summary, folder_name);
+	if (si != NULL) {
 		if ((si->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED) == 0) {
 			si->flags |= CAMEL_STORE_INFO_FOLDER_SUBSCRIBED;
 			si->flags |= CAMEL_FOLDER_SUBSCRIBED;

Modified: trunk/src/libexchangemapi/exchange-mapi-cal-tz-utils.c
==============================================================================
--- trunk/src/libexchangemapi/exchange-mapi-cal-tz-utils.c	(original)
+++ trunk/src/libexchangemapi/exchange-mapi-cal-tz-utils.c	Mon Feb  2 05:15:27 2009
@@ -200,13 +200,13 @@
 	g_message("%s(%d): %s: ", __FILE__, __LINE__, __PRETTY_FUNCTION__);
 	for (i = 0; i < zones->num_elements; i++) {
 		icaltimezone *zone;
-		char *tzid = NULL;
+		const char *tzid = NULL;
 
 		zone = icalarray_element_at (zones, i);
 
 		tzid = icaltimezone_get_tzid (zone);
 
-		list_items = g_list_prepend (list_items, tzid);
+		list_items = g_list_prepend (list_items, (gpointer)tzid);
 	}
 
 	list_items = g_list_sort (list_items, (GCompareFunc) g_ascii_strcasecmp);