Mercurial > pidgin.yaz
changeset 22065:9a1f88d6a875
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>
| author | Andreas Stührk <andy-pidgin@hammerhartes.de> |
|---|---|
| date | Sun, 13 Jan 2008 16:25:11 +0000 |
| parents | 1af120c0fafd |
| children | 542d35f101ff |
| files | COPYRIGHT libpurple/dbus-server.c |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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);