Mercurial > pidgin
changeset 29607:59f4012b2b94
Found a few more places that need to use 64 bit value for the capabilities
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 18 Mar 2010 05:47:15 +0000 |
| parents | 0d3145e6b1d6 |
| children | 8d4bed3021dc |
| files | libpurple/protocols/oscar/msgcookie.c libpurple/protocols/oscar/oscar.c libpurple/protocols/oscar/oscar.h |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/msgcookie.c Thu Mar 18 04:53:49 2010 +0000 +++ b/libpurple/protocols/oscar/msgcookie.c Thu Mar 18 05:47:15 2010 +0000 @@ -179,7 +179,7 @@ } /* XXX I hate switch */ -int aim_msgcookie_gettype(int type) +int aim_msgcookie_gettype(guint64 type) { /* XXX: hokey-assed. needs fixed. */ switch(type) {
--- a/libpurple/protocols/oscar/oscar.c Thu Mar 18 04:53:49 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Thu Mar 18 05:47:15 2010 +0000 @@ -2615,8 +2615,9 @@ if (args == NULL) return 0; - purple_debug_misc("oscar", "Incoming rendezvous message of type %u, " - "user %s, status %hu\n", args->type, userinfo->bn, args->status); + purple_debug_misc("oscar", "Incoming rendezvous message of type %" + G_GUINT64_FORMAT ", user %s, status %hu\n", + args->type, userinfo->bn, args->status); if (args->msg != NULL) { @@ -2756,8 +2757,8 @@ } else { - purple_debug_error("oscar", "Unknown request class %hu\n", - args->type); + purple_debug_error("oscar", "Unknown request class %" + G_GUINT64_FORMAT "\n", args->type); } g_free(message);
--- a/libpurple/protocols/oscar/oscar.h Thu Mar 18 04:53:49 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.h Thu Mar 18 05:47:15 2010 +0000 @@ -944,7 +944,7 @@ { guint16 status; guchar cookie[8]; - int type; /* One of the OSCAR_CAPABILITY_ constants */ + guint64 type; /* One of the OSCAR_CAPABILITY_ constants */ const char *proxyip; const char *clientip; const char *verifiedip; @@ -1705,7 +1705,7 @@ IcbmCookie *aim_mkcookie(guint8 *, int, void *); IcbmCookie *aim_checkcookie(OscarData *, const unsigned char *, const int); int aim_freecookie(OscarData *od, IcbmCookie *cookie); -int aim_msgcookie_gettype(int type); +int aim_msgcookie_gettype(guint64 type); int aim_cookie_free(OscarData *od, IcbmCookie *cookie); int aim_chat_readroominfo(ByteStream *bs, struct aim_chat_roominfo *outinfo);