Re: [evolution-patches] [PATCH] More 64-bit cleanups

[Jeremy Katz <katzj redhat com>]

On Thu, 2003-04-03 at 12:55, Jeremy Katz wrote:
> The attached patch (applies to HEAD too, this is the 1.2.x version)
> cleans up a couple of places where evolution isn't 64-bit clean.  With
> these changes, evolution is looking pretty happy in quick testing on a
> 64-bit box.  

Oops, I can't type.  That'll teach me to send the patch before I
actually compile it and use it.   Fixed version attached.

Jeremy

? evolution-krb5-multilib.patch
Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.1681.2.13
diff -u -u -r1.1681.2.13 ChangeLog
--- camel/ChangeLog	14 Mar 2003 17:42:51 -0000	1.1681.2.13
+++ camel/ChangeLog	3 Apr 2003 17:49:18 -0000
@@ -1,3 +1,8 @@
+2003-04-03  Jeremy Katz  <katzj redhat com>
+
+	* providers/imap/camel-imap-folder.c (parse_fetch_response):
+	body_len needs to be a size_t instead of int
+
 2003-03-13  Jeffrey Stedfast  <fejj ximian com>
 
 	* camel-mime-part.c (process_header): Use
Index: camel/providers/imap/camel-imap-folder.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/imap/camel-imap-folder.c,v
retrieving revision 1.294
diff -u -u -r1.294 camel-imap-folder.c
--- camel/providers/imap/camel-imap-folder.c	3 Oct 2002 01:54:52 -0000	1.294
+++ camel/providers/imap/camel-imap-folder.c	3 Apr 2003 17:49:19 -0000
@@ -2577,7 +2577,7 @@
 	GData *data = NULL;
 	char *start, *part_spec = NULL, *body = NULL, *uid = NULL, *idate = NULL;
 	gboolean cache_header = TRUE, header = FALSE;
-	int body_len = 0;
+	size_t body_len = 0;
 	
 	if (*response != '(') {
 		long seq;
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2444.2.21
diff -u -u -r1.2444.2.21 ChangeLog
--- mail/ChangeLog	17 Mar 2003 16:08:48 -0000	1.2444.2.21
+++ mail/ChangeLog	3 Apr 2003 17:49:23 -0000
@@ -1,3 +1,8 @@
+2003-04-03  Jeremy Katz  <katzj redhat com>
+
+	* folder-browser-ui.c (fbui_sensitise_item): Don't just blindly
+	cast an int to gpointer, use the proper glib magic instead.
+
 2003-03-14  Jeffrey Stedfast  <fejj ximian com>
 
 	* mail-display.c (do_external_viewer): Lookup the handler for the
Index: mail/folder-browser-ui.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/folder-browser-ui.c,v
retrieving revision 1.60
diff -u -u -r1.60 folder-browser-ui.c
--- mail/folder-browser-ui.c	27 Sep 2002 19:22:45 -0000	1.60
+++ mail/folder-browser-ui.c	3 Apr 2003 17:49:23 -0000
@@ -628,13 +628,15 @@
 fbui_sensitise_item (FolderBrowser *fb, const char *item, int state)
 {
 	char *name, *key;
+	gpointer val_ptr;
 	int val;
 	
 	/* If this whole caching idea doesn't work, remove it here */
 	if (fb->sensitise_state == NULL)
 		fb->sensitise_state = g_hash_table_new (g_str_hash, g_str_equal);
 	
-	if (g_hash_table_lookup_extended (fb->sensitise_state, item, (void **)&key, (void **)&val)) {
+	if (g_hash_table_lookup_extended (fb->sensitise_state, item, (void **)&key, &val_ptr)) {
+		val = GPOINTER_TO_INT(val_ptr);
 		if (val == state)
 			return;
 	}
@@ -643,7 +645,7 @@
 		name = alloca (strlen (item) + strlen ("/commands/") + 1);
 		sprintf (name, "/commands/%s", item);
 		bonobo_ui_component_set_prop (fb->uicomp, name, "sensitive", state ? "1" : "0", NULL);
-		g_hash_table_insert (fb->sensitise_state, (char *) item, (gpointer) state);
+		g_hash_table_insert (fb->sensitise_state, (char *) item, GINT_TO_POINTER(state));
 	}
 }