# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1268891235 0
# Node ID 59f4012b2b94dffe39067f0195a24b493c0dfdb9
# Parent  0d3145e6b1d6a0047a24941ff956c4c1c52852ae
Found a few more places that need to use 64 bit value for the capabilities

diff -r 0d3145e6b1d6 -r 59f4012b2b94 libpurple/protocols/oscar/msgcookie.c
--- 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) {
diff -r 0d3145e6b1d6 -r 59f4012b2b94 libpurple/protocols/oscar/oscar.c
--- 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);
diff -r 0d3145e6b1d6 -r 59f4012b2b94 libpurple/protocols/oscar/oscar.h
--- 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);