evolution-mapi r36 - in trunk/src: addressbook camel

[msuman svn gnome org]

Author: msuman
Date: Fri Dec 19 04:51:36 2008
New Revision: 36
URL: http://svn.gnome.org/viewvc/evolution-mapi?rev=36&view=rev

Log:
More compilation warnings fixed in camel (bug #564553).

Modified:
   trunk/src/addressbook/e-book-backend-mapi.c
   trunk/src/camel/ChangeLog
   trunk/src/camel/camel-mapi-folder.c
   trunk/src/camel/camel-mapi-transport.c

Modified: trunk/src/addressbook/e-book-backend-mapi.c
==============================================================================
--- trunk/src/addressbook/e-book-backend-mapi.c	(original)
+++ trunk/src/addressbook/e-book-backend-mapi.c	Fri Dec 19 04:51:36 2008
@@ -1033,6 +1033,7 @@
 	for (i=1; i<maplen; i++) {
 		gpointer value;
 
+		/* XXX Casting away return value const'ness. */
 		value = find_mapi_SPropValue_data (properties, mappings[i].mapi_id);
 		if (mappings[i].element_type == PT_STRING8 && mappings[i].contact_type == ELEMENT_TYPE_SIMPLE) {
 			if (value)

Modified: trunk/src/camel/camel-mapi-folder.c
==============================================================================
--- trunk/src/camel/camel-mapi-folder.c	(original)
+++ trunk/src/camel/camel-mapi-folder.c	Fri Dec 19 04:51:36 2008
@@ -25,6 +25,8 @@
 #include <string.h>
 #include <time.h>
 
+#include <glib.h>
+
 #include <camel/camel-folder-search.h>
 #include <camel/camel-mime-part.h>
 #include <camel/camel-mime-utils.h>
@@ -72,7 +74,7 @@
 /*For collecting summary info from server*/
 typedef struct {
 	GSList *items_list;
-	const struct timeval *last_modification_time;
+	GTimeVal *last_modification_time;
 }fetch_items_data;
 
 static CamelMimeMessage *mapi_folder_item_to_msg( CamelFolder *folder, MapiItem *item, CamelException *ex );
@@ -188,6 +190,7 @@
 	struct FILETIME *delivery_date = NULL;
 	struct FILETIME *last_modification_time = NULL;
 	struct timeval *item_modification_time = NULL;
+	struct timeval fi_data_mod_time;
 	guint32 j = 0;
 	NTTIME ntdate;
 
@@ -259,8 +262,13 @@
 		nttime_to_timeval(item_modification_time, ntdate);
 	}
 
-	if (timeval_compare (item_modification_time, fi_data->last_modification_time) == 1) 
-			fi_data->last_modification_time = item_modification_time;
+	fi_data_mod_time.tv_sec = fi_data->last_modification_time->tv_sec;
+	fi_data_mod_time.tv_usec = fi_data->last_modification_time->tv_usec;
+
+	if (timeval_compare (item_modification_time, &fi_data_mod_time) == 1) {
+			fi_data->last_modification_time->tv_sec = item_modification_time->tv_sec;
+			fi_data->last_modification_time->tv_usec = item_modification_time->tv_usec;
+	}
 
 	if ((*flags & MSGFLAG_READ) != 0)
 		item->header.flags |= CAMEL_MESSAGE_SEEN;
@@ -596,9 +604,8 @@
 		mapi_id_t temp_folder_id;
 		guint32 options = 0;
 
-		fetch_data->last_modification_time = g_new0 (struct timeval, 1); /*First Sync*/
+		fetch_data->last_modification_time = g_new0 (GTimeVal, 1); /*First Sync*/
 
-		/* XXX Casting a timeval to a GTimeVal is not portable. */
 		if (mapi_summary->sync_time_stamp && *mapi_summary->sync_time_stamp &&
 		    g_time_val_from_iso8601 (mapi_summary->sync_time_stamp, fetch_data->last_modification_time)) {
 			struct SPropValue sprop;
@@ -653,7 +660,6 @@
 		}
 
 		/*Preserve last_modification_time from this fetch for later use with restrictions.*/
-		/* XXX Casting a timeval to a GTimeVal is not portable. */
 		mapi_summary->sync_time_stamp = g_time_val_to_iso8601 (fetch_data->last_modification_time);
 
 		camel_folder_summary_touch (folder->summary);

Modified: trunk/src/camel/camel-mapi-transport.c
==============================================================================
--- trunk/src/camel/camel-mapi-transport.c	(original)
+++ trunk/src/camel/camel-mapi-transport.c	Fri Dec 19 04:51:36 2008
@@ -150,7 +150,7 @@
 mapi_item_add_attach (MapiItem *item, CamelMimePart *part, CamelStream *content_stream)
 {
 	guint8 *buf = g_new0 (guint8 , STREAM_SIZE);
-	gchar *content_id = NULL;
+	const gchar *content_id = NULL;
 	guint32	read_size, flag, i = 0;
 
 	ExchangeMAPIAttachment *item_attach;