# HG changeset patch
# User Andreas St���hrk <andy-pidgin@hammerhartes.de>
# Date 1200241511 0
# Node ID 9a1f88d6a8750eb1f02b70d2ab6050751541f719
# Parent  1af120c0fafd722fe26224a727f7dc75691f2208
A patch from Andreas St���hrk (Trundle) to fix a problem with our DBus code
on amd64.  Fixes #3926.

committer: Richard Laager <rlaager@wiktel.com>

diff -r 1af120c0fafd -r 9a1f88d6a875 COPYRIGHT
--- a/COPYRIGHT	Sun Jan 13 16:20:28 2008 +0000
+++ b/COPYRIGHT	Sun Jan 13 16:25:11 2008 +0000
@@ -370,6 +370,7 @@
 Richard Stellingwerff
 Charlie Stockman
 David Stoddard
+Andreas Stührk
 Oleg Sukhodolsky
 Sun Microsystems
 Mårten Svantesson (fursten)
diff -r 1af120c0fafd -r 9a1f88d6a875 libpurple/dbus-server.c
--- a/libpurple/dbus-server.c	Sun Jan 13 16:20:28 2008 +0000
+++ b/libpurple/dbus-server.c	Sun Jan 13 16:25:11 2008 +0000
@@ -729,7 +729,7 @@
 			if (id == 0 && val != NULL)
 				error = TRUE;      /* Some error happened. */
 			dbus_message_iter_append_basic(iter,
-					(sizeof(void *) == 4) ? DBUS_TYPE_UINT32 : DBUS_TYPE_UINT64, &id);
+					(sizeof(id) == sizeof(dbus_int32_t)) ? DBUS_TYPE_INT32 : DBUS_TYPE_INT64, &id);
 			break;
 		default: /* no conversion implemented */
 			g_return_val_if_reached(TRUE);