pidgin: 4daa8111: Found a few more places that need to use...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 4daa81110f07fded726a9c4bcbbc75862aa60edb
Ancestor: 8df884656e9b2e225d429b9121f8449894019d96
Author: markdoliner at pidgin.im
Date: 2010-03-18T05:47:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4daa81110f07fded726a9c4bcbbc75862aa60edb

Modified files:
        libpurple/protocols/oscar/msgcookie.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

Found a few more places that need to use 64 bit value for the capabilities

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/msgcookie.c	fa2175271079c562cc9e675c8583117f0cb494bf
+++ libpurple/protocols/oscar/msgcookie.c	8989df9d1df8c184b4954f2b7163ff160f25ed6e
@@ -179,7 +179,7 @@ int aim_cookie_free(OscarData *od, IcbmC
 }
 
 /* XXX I hate switch */
-int aim_msgcookie_gettype(int type)
+int aim_msgcookie_gettype(guint64 type)
 {
 	/* XXX: hokey-assed. needs fixed. */
 	switch(type) {
============================================================
--- libpurple/protocols/oscar/oscar.c	40ba3baa491b1928e74e922c876d8c453c2e3c59
+++ libpurple/protocols/oscar/oscar.c	4d3709a1f00de21f477ab58426c87ecd046bfbad
@@ -2615,8 +2615,9 @@ incomingim_chan2(OscarData *od, FlapConn
 	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 @@ incomingim_chan2(OscarData *od, FlapConn
 	}
 	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);
============================================================
--- libpurple/protocols/oscar/oscar.h	0d574d014e34a5c20c7e7c8faf8a12f9726d9552
+++ libpurple/protocols/oscar/oscar.h	1425f0be89f631ccacb93b9a25c396b5dd82806d
@@ -944,7 +944,7 @@ struct _IcbmArgsCh2
 {
 	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 @@ int aim_freecookie(OscarData *od, IcbmCo
 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);