Mercurial > pidgin.yaz
changeset 13134:b2d838b7eb00
[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>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 06 Feb 2006 07:52:40 +0000 |
| parents | 541486fde12b |
| children | 7fd39c81d5e9 |
| files | src/dbus-server.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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();