im.pidgin.pidgin: 66747d2effdee1574f75197f1be73f271ef2b3bc

[andy-pidgin at hammerhartes.de]

-----------------------------------------------------------------
Revision: 66747d2effdee1574f75197f1be73f271ef2b3bc
Ancestor: a5676178695dfb25c3b59552a12f7143a6618114
Author: andy-pidgin at hammerhartes.de
Date: 2008-01-13T16:25:11
Branch: im.pidgin.pidgin

Modified files:
        COPYRIGHT libpurple/dbus-server.c

ChangeLog: 

A patch from Andreas Stührk (Trundle) to fix a problem with our DBus code
on amd64.  Fixes #3926.

-------------- next part --------------
============================================================
--- COPYRIGHT	1b8ecbca2c3d7a5a41f965655d73c8ece7e60b50
+++ COPYRIGHT	6f1862feec013fd82f6e8a15e804dd579e9fa282
@@ -370,6 +370,7 @@ David Stoddard
 Richard Stellingwerff
 Charlie Stockman
 David Stoddard
+Andreas Stührk
 Oleg Sukhodolsky
 Sun Microsystems
 MÃ¥rten Svantesson (fursten)
============================================================
--- libpurple/dbus-server.c	445678a623b2413bc9ed33efc230aa652d2b7eef
+++ libpurple/dbus-server.c	b2fa6ea5fa7e1bc4b38b082f2c9e9c30230a5c5a
@@ -729,7 +729,7 @@ purple_dbus_message_append_purple_values
 			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);