Mercurial > pidgin.yaz
diff libpurple/protocols/oscar/oscar.c @ 30007:0d3145e6b1d6
Change the oscar capabilities variable to be a guint64 everywhere instead
of an enum, which can be 32 bits
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 18 Mar 2010 04:53:49 +0000 |
parents | 3e5bb4e2334c |
children | 59f4012b2b94 |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Wed Mar 17 20:42:48 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Thu Mar 18 04:53:49 2010 +0000 @@ -71,9 +71,18 @@ #define OSCAR_CONNECT_STEPS 6 -static OscarCapability purple_caps = (OSCAR_CAPABILITY_CHAT | OSCAR_CAPABILITY_BUDDYICON | OSCAR_CAPABILITY_DIRECTIM | - OSCAR_CAPABILITY_SENDFILE | OSCAR_CAPABILITY_UNICODE | OSCAR_CAPABILITY_INTEROPERATE | - OSCAR_CAPABILITY_SHORTCAPS | OSCAR_CAPABILITY_TYPING | OSCAR_CAPABILITY_ICQSERVERRELAY | OSCAR_CAPABILITY_NEWCAPS | OSCAR_CAPABILITY_XTRAZ); +static guint64 purple_caps = + OSCAR_CAPABILITY_CHAT + | OSCAR_CAPABILITY_BUDDYICON + | OSCAR_CAPABILITY_DIRECTIM + | OSCAR_CAPABILITY_SENDFILE + | OSCAR_CAPABILITY_UNICODE + | OSCAR_CAPABILITY_INTEROPERATE + | OSCAR_CAPABILITY_SHORTCAPS + | OSCAR_CAPABILITY_TYPING + | OSCAR_CAPABILITY_ICQSERVERRELAY + | OSCAR_CAPABILITY_NEWCAPS + | OSCAR_CAPABILITY_XTRAZ; static guint8 features_aim[] = {0x01, 0x01, 0x01, 0x02}; static guint8 features_icq[] = {0x01, 0x06}; @@ -673,7 +682,7 @@ return g_string_free(cpy, FALSE); } -static gchar *oscar_caps_to_string(OscarCapability caps) +static gchar *oscar_caps_to_string(guint64 caps) { GString *str; const gchar *tmp;