evolution-data-server r9191 - in trunk/camel: . providers/local

[mcrha svn gnome org]

Author: mcrha
Date: Fri Jul 25 06:47:29 2008
New Revision: 9191
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9191&view=rev

Log:
2008-07-25  Milan Crha  <mcrha redhat com>

	** Fix for bug #544031

	* camel/camel-vee-folder.c: (vee_folder_remove_folder):
	* camel/camel-folder-summary.c: (camel_folder_summary_migrate_infos),
	(content_info_to_db): Compiler warnings cleanup.

	* camel/providers/local/camel-mbox-summary.c: (summary_header_to_db):
	Compiler warning cleanup.



Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-folder-summary.c
   trunk/camel/camel-vee-folder.c
   trunk/camel/providers/local/ChangeLog
   trunk/camel/providers/local/camel-mbox-summary.c

Modified: trunk/camel/camel-folder-summary.c
==============================================================================
--- trunk/camel/camel-folder-summary.c	(original)
+++ trunk/camel/camel-folder-summary.c	Fri Jul 25 06:47:29 2008
@@ -1049,7 +1049,7 @@
 
 	if (s->summary_path == NULL) {
 		g_warning ("No summary path set. Unable to migrate\n");
-		return NULL;
+		return -1;
 	}
 
 	in = g_fopen(s->summary_path, "rb");
@@ -3205,22 +3205,22 @@
 	ct = ci->type;
 	if (ct) {
 		if (ct->type)
-			g_string_append_printf (str, " %d-%s", strlen (ct->type), ct->type);
+			g_string_append_printf (str, " %d-%s", (int) strlen (ct->type), ct->type);
 		else 
 			g_string_append_printf (str, " 0-");
 		if (ct->subtype)
-			g_string_append_printf (str, " %d-%s", strlen (ct->subtype), ct->subtype);
+			g_string_append_printf (str, " %d-%s", (int) strlen (ct->subtype), ct->subtype);
 		else 
 			g_string_append_printf (str, " 0-");
 		g_string_append_printf (str, " %d", my_list_size((struct _node **)&ct->params));
 		hp = ct->params;
 		while (hp) {
 			if (hp->name)
-				g_string_append_printf (str, " %d-%s", strlen(hp->name), hp->name);
+				g_string_append_printf (str, " %d-%s", (int)strlen(hp->name), hp->name);
 			else 
 				g_string_append_printf (str, " 0-");
 			if (hp->value)
-				g_string_append_printf (str, " %d-%s", strlen (hp->value), hp->value);
+				g_string_append_printf (str, " %d-%s", (int)strlen (hp->value), hp->value);
 			else
 				g_string_append_printf (str, " 0-");
 			hp = hp->next;
@@ -3232,15 +3232,15 @@
 	}
 
 	if (ci->id)
-		g_string_append_printf (str, " %d-%s", strlen (ci->id), ci->id);
+		g_string_append_printf (str, " %d-%s", (int)strlen (ci->id), ci->id);
 	else 
 		g_string_append_printf (str, " 0-");
 	if (ci->description)
-		g_string_append_printf (str, " %d-%s", strlen (ci->description), ci->description);
+		g_string_append_printf (str, " %d-%s", (int)strlen (ci->description), ci->description);
 	else
 		g_string_append_printf (str, " 0-");
 	if (ci->encoding)
-		g_string_append_printf (str, " %d-%s", strlen (ci->encoding), ci->encoding);
+		g_string_append_printf (str, " %d-%s", (int)strlen (ci->encoding), ci->encoding);
 	else
 		g_string_append_printf (str, " 0-");
 	g_string_append_printf (str, " %u", ci->size);

Modified: trunk/camel/camel-vee-folder.c
==============================================================================
--- trunk/camel/camel-vee-folder.c	(original)
+++ trunk/camel/camel-vee-folder.c	Fri Jul 25 06:47:29 2008
@@ -881,7 +881,7 @@
 							if (n == 1) {
 								CamelMessageInfo *tinfo;
 								g_hash_table_remove(unmatched_uids, oldkey);
-								if (tinfo = (CamelMessageInfo *) vee_folder_add_uid(folder_unmatched, source, oldkey+8, hash)) {
+								if ((tinfo = (CamelMessageInfo *) vee_folder_add_uid(folder_unmatched, source, oldkey+8, hash)) != NULL) {
 									camel_message_info_free (tinfo);
 									camel_folder_change_info_add_uid(folder_unmatched->changes, oldkey);
 								}

Modified: trunk/camel/providers/local/camel-mbox-summary.c
==============================================================================
--- trunk/camel/providers/local/camel-mbox-summary.c	(original)
+++ trunk/camel/providers/local/camel-mbox-summary.c	Fri Jul 25 06:47:29 2008
@@ -303,7 +303,7 @@
 	fir = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)->summary_header_to_db (s, ex);
 	if (fir) {
 		tmp = fir->bdata;
-		fir->bdata = g_strdup_printf ("%s %d %d", tmp ? tmp : "", CAMEL_MBOX_SUMMARY_VERSION, mbs->folder_size);
+		fir->bdata = g_strdup_printf ("%s %d %d", tmp ? tmp : "", CAMEL_MBOX_SUMMARY_VERSION, (int) mbs->folder_size);
 		g_free (tmp);
 	}