Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.139.2.23
diff -u -p -r1.139.2.23 ChangeLog
--- ChangeLog	21 Dec 2004 08:57:25 -0000	1.139.2.23
+++ ChangeLog	10 Jan 2005 05:14:46 -0000
@@ -1,3 +1,12 @@
+2005-01-10  Not Zed  <NotZed@Ximian.com>
+
+	* mail/mail-stub.c (mail_stub_read_args): long/int ->uint32.
+	(mail_stub_return_data): "
+
+	* camel/camel-stub.c (stub_send_internal): uint32 should be a
+	uint32, not a long.
+	(stub_send_internal): same for uint32array and int
+
 2004-12-21  Sarfraaz Ahmed <asarfraaz@novell.com>
 
 	* calendar/e-cal-backend-exchange.c (e_cal_backend_exchange_add_object):
Index: mail/mail-stub.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/mail/mail-stub.c,v
retrieving revision 1.3
diff -u -p -r1.3 mail-stub.c
--- mail/mail-stub.c	21 May 2004 18:42:08 -0000	1.3
+++ mail/mail-stub.c	10 Jan 2005 05:14:46 -0000
@@ -426,7 +426,7 @@ mail_stub_read_args (MailStub *stub, ...
 
 		case CAMEL_STUB_ARG_UINT32:
 		{
-			unsigned long *val = va_arg (ap, unsigned long *);
+			guint32 *val = va_arg (ap, guint32 *);
 			guint32 val32;
 
 			status = camel_stub_marshal_decode_uint32 (stub->cmd, &val32);
@@ -488,7 +488,7 @@ mail_stub_read_args (MailStub *stub, ...
 			status = camel_stub_marshal_decode_uint32 (stub->cmd, &len);
 			if (status == -1)
 				break;
-			*arr = g_array_new (FALSE, FALSE, sizeof (int));
+			*arr = g_array_new (FALSE, FALSE, sizeof (guint32));
 			for (i = 0; i< len && status != -1; i++) {
 				status = camel_stub_marshal_decode_uint32 (stub->cmd, &unread_count);
 				if (status != -1)
@@ -549,7 +549,7 @@ mail_stub_return_data (MailStub *stub, C
 
 		case CAMEL_STUB_ARG_UINT32:
 		{
-			unsigned long val = va_arg (ap, unsigned long);
+			guint32 val = va_arg (ap, guint32);
 
 			camel_stub_marshal_encode_uint32 (marshal, val);
 			break;
@@ -601,7 +601,7 @@ mail_stub_return_data (MailStub *stub, C
 
 			camel_stub_marshal_encode_uint32 (marshal, arr->len);
 			for (i = 0; i < arr->len; i++)
-				camel_stub_marshal_encode_uint32 (marshal, g_array_index (arr, int, i));
+				camel_stub_marshal_encode_uint32 (marshal, g_array_index (arr, guint32, i));
 			break;
 		}
 		
Index: camel/camel-stub.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/camel/camel-stub.c,v
retrieving revision 1.1.1.2
diff -u -p -r1.1.1.2 camel-stub.c
--- camel/camel-stub.c	11 May 2004 15:15:58 -0000	1.1.1.2
+++ camel/camel-stub.c	10 Jan 2005 05:14:46 -0000
@@ -224,7 +224,7 @@ stub_send_internal (CamelStub *stub, Cam
 
 		case CAMEL_STUB_ARG_UINT32:
 		{
-			unsigned long val = va_arg (ap, unsigned long);
+			guint32 val = va_arg (ap, guint32);
 
 			camel_stub_marshal_encode_uint32 (stub->cmd, val);
 			break;
@@ -272,7 +272,7 @@ stub_send_internal (CamelStub *stub, Cam
 
 			camel_stub_marshal_encode_uint32 (stub->cmd, arr->len);
 			for (i = 0; i < arr->len; i++)
-				camel_stub_marshal_encode_uint32 (stub->cmd, g_array_index (arr, int, i));
+				camel_stub_marshal_encode_uint32 (stub->cmd, g_array_index (arr, guint32, i));
 			break;
 		}		
 		
@@ -337,7 +337,7 @@ stub_send_internal (CamelStub *stub, Cam
 
 				case CAMEL_STUB_ARG_UINT32:
 				{
-					unsigned long *val = va_arg (ap, unsigned long *);
+					guint32 *val = va_arg (ap, guint32 *);
 					guint32 val32;
 
 					status = camel_stub_marshal_decode_uint32 (stub->cmd, &val32);
@@ -402,7 +402,7 @@ stub_send_internal (CamelStub *stub, Cam
 					status = camel_stub_marshal_decode_uint32 (stub->cmd, &len);
 					if (status == -1)
 						break;
-					*arr = g_array_new (FALSE, FALSE, sizeof (int));
+					*arr = g_array_new (FALSE, FALSE, sizeof (guint32));
 					for (i = 0; i< len && status != -1; i++) {
 						status = camel_stub_marshal_decode_uint32 (stub->cmd, &unread_count);
 						if (status != -1)
