[evolution-patches] camel 64bit patches for 1-4-branch

[Jeffrey Stedfast <fejj ximian com>]

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.1836.2.22
diff -u -r1.1836.2.22 ChangeLog
--- ChangeLog	1 Dec 2003 22:39:43 -0000	1.1836.2.22
+++ ChangeLog	4 Feb 2004 03:30:03 -0000
@@ -1,3 +1,11 @@
+2004-02-03  Jeffrey Stedfast  <fejj ximian com>
+
+	* camel-vee-folder.c (folder_added_uid): 64bit fix.
+	(folder_changed_add_uid): Here too.
+	(folder_changed_remove_uid): Same.
+	(vee_folder_remove_folder): Here too.
+	(vee_folder_build_folder): Here too.
+
 2003-12-01  Jeffrey Stedfast  <fejj ximian com>
 
 	* camel-process.c (camel_process_fork): Same.
Index: camel-vee-folder.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/camel-vee-folder.c,v
retrieving revision 1.57
diff -u -r1.57 camel-vee-folder.c
--- camel-vee-folder.c	18 Jun 2003 06:14:09 -0000	1.57
+++ camel-vee-folder.c	4 Feb 2004 03:30:05 -0000
@@ -902,7 +902,8 @@
 	char hash[8];
 	/*struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);*/
 	CamelFolderChangeInfo *vf_changes = NULL, *unmatched_changes = NULL;
-
+	gpointer oldval;
+	
 	if (vf == folder_unmatched)
 		return;
 
@@ -969,7 +970,8 @@
 				}
 				if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0) {
 					if (still) {
-						if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n)) {
+						if (g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, &oldval)) {
+							n = GPOINTER_TO_INT (oldval);
 							if (n == 1) {
 								g_hash_table_remove(unmatched_uids, oldkey);
 								if (vee_folder_add_uid(folder_unmatched, source, oldkey+8, hash))
@@ -980,7 +982,7 @@
 							}
 						}
 					} else {
-						if (g_hash_table_lookup_extended(unmatched_uids, camel_message_info_uid(mi), (void **)&oldkey, (void **)&n)) {
+						if (g_hash_table_lookup_extended(unmatched_uids, camel_message_info_uid(mi), (void **)&oldkey, &oldval)) {
 							g_hash_table_remove(unmatched_uids, oldkey);
 							g_free(oldkey);
 						}
@@ -1051,6 +1053,7 @@
 folder_added_uid(char *uidin, void *value, struct _update_data *u)
 {
 	CamelVeeMessageInfo *mi;
+	gpointer oldval;
 	char *oldkey;
 	int n;
 
@@ -1058,7 +1061,8 @@
 		camel_folder_change_info_add_uid(u->vf->changes, camel_message_info_uid(mi));
 
 		if (!CAMEL_IS_VEE_FOLDER(u->source)) {
-			if (g_hash_table_lookup_extended(unmatched_uids, camel_message_info_uid(mi), (void **)&oldkey, (void **)&n)) {
+			if (g_hash_table_lookup_extended(unmatched_uids, camel_message_info_uid(mi), (void **)&oldkey, &oldval)) {
+				n = GPOINTER_TO_INT (oldval);
 				g_hash_table_insert(unmatched_uids, oldkey, GINT_TO_POINTER(n+1));
 			} else {
 				g_hash_table_insert(unmatched_uids, g_strdup(camel_message_info_uid(mi)), GINT_TO_POINTER(1));
@@ -1121,7 +1125,8 @@
 		if (mi) {
 			if (mi->folder == source) {
 				char *uid = (char *)camel_message_info_uid(mi), *oldkey;
-
+				gpointer oldval;
+				
 				if (g_hash_table_lookup(matchhash, uid+8) == NULL) {
 					if (last == -1) {
 						last = start = i;
@@ -1134,7 +1139,8 @@
 					}
 					camel_folder_change_info_remove_uid(vf->changes, camel_message_info_uid(mi));
 					if (!CAMEL_IS_VEE_FOLDER(source)
-					    && g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, (void **)&n)) {
+					    && g_hash_table_lookup_extended(unmatched_uids, uid, (void **)&oldkey, &oldval)) {
+						n = GPOINTER_TO_INT (oldval);
 						if (n == 1) {
 							g_hash_table_remove(unmatched_uids, oldkey);
 							g_free(oldkey);
@@ -1230,6 +1236,7 @@
 {
 	CamelVeeMessageInfo *vinfo;
 	const char *vuid;
+	gpointer oldval;
 	char *oldkey;
 	int n;
 
@@ -1241,10 +1248,11 @@
 	camel_folder_change_info_add_uid(vf->changes,  vuid);
 
 	if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0 && !CAMEL_IS_VEE_FOLDER(sub)) {
-		if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, (void **)&n)) {
+		if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, &oldval)) {
+			n = GPOINTER_TO_INT (oldval);
 			g_hash_table_insert(unmatched_uids, oldkey, GINT_TO_POINTER(n+1));
 		} else {
-			g_hash_table_insert(unmatched_uids, g_strdup(vuid), (void *)1);
+			g_hash_table_insert(unmatched_uids, g_strdup(vuid), GINT_TO_POINTER (1));
 		}
 		vinfo = (CamelVeeMessageInfo *)camel_folder_get_message_info((CamelFolder *)folder_unmatched, vuid);
 		if (vinfo) {
@@ -1260,6 +1268,7 @@
 {
 	CamelFolder *folder = (CamelFolder *)vf;
 	char *vuid, *oldkey;
+	gpointer oldval;
 	int n;
 	CamelVeeMessageInfo *vinfo;
 
@@ -1276,7 +1285,8 @@
 
 	if ((vf->flags & CAMEL_STORE_FOLDER_PRIVATE) == 0 && !CAMEL_IS_VEE_FOLDER(sub)) {
 		if (keep) {
-			if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, (void **)&n)) {
+			if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, &oldval)) {
+				n = GPOINTER_TO_INT (oldval);
 				if (n == 1) {
 					g_hash_table_remove(unmatched_uids, oldkey);
 					if (vee_folder_add_uid(folder_unmatched, sub, uid, hash))
@@ -1290,7 +1300,7 @@
 					camel_folder_change_info_add_uid(folder_unmatched->changes, oldkey);
 			}
 		} else {
-			if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, (void **)&n)) {
+			if (g_hash_table_lookup_extended(unmatched_uids, vuid, (void **)&oldkey, &oldval)) {
 				g_hash_table_remove(unmatched_uids, oldkey);
 				g_free(oldkey);
 			}