# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1139212360 0
# Node ID b2d838b7eb007cd29fdd2c4d5bf847e5a044c8bc
# Parent  541486fde12b927f05b4c07329bf37fecf78b206
[gaim-migrate @ 15496]
Part of SF Patch #1417219 from Sadrul

"Without knowing much (anything) about DBus, it looks
 like we should tell DBus to use 64-bits for
 pointer/box/subtype values in 64-bit platform."

Hey, I don't know anything about DBus either, but that makes sense to me.

committer: Tailor Script <tailor@pidgin.im>

diff -r 541486fde12b -r b2d838b7eb00 src/dbus-server.c
--- a/src/dbus-server.c	Mon Feb 06 07:46:35 2006 +0000
+++ b/src/dbus-server.c	Mon Feb 06 07:52:40 2006 +0000
@@ -656,10 +656,10 @@
 	    break;
 	case GAIM_TYPE_SUBTYPE: /* registered pointers only! */
 	case GAIM_TYPE_POINTER:
-	case GAIM_TYPE_OBJECT: 
-	case GAIM_TYPE_BOXED:		
+	case GAIM_TYPE_OBJECT:
+	case GAIM_TYPE_BOXED:
 	    id = gaim_dbus_pointer_to_id(my_arg(gpointer));
-	    dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &id);
+	    dbus_message_iter_append_basic(iter, (sizeof(void *) == 4) ? DBUS_TYPE_UINT32 : DBUS_TYPE_UINT64, &id);
 	    break;
 	default:		/* no conversion implemented */
 	    g_return_if_reached();