Mercurial > pidgin
changeset 26586:608493e51182
propagate from branch 'im.pidgin.pidgin' (head 580055bb22fea0076d3a90d9df9346abd1789bab)
to branch 'im.pidgin.cpw.malu.client_type' (head ca6f339669ed597f2e930f0bfed45861ab81ef36)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 13 Apr 2009 13:36:00 +0000 |
| parents | 8c3b1a059ecc (current diff) eea396f1583c (diff) |
| children | 74dcea0f8457 |
| files | libpurple/protocols/jabber/buddy.c libpurple/protocols/jabber/jabber.c pidgin/gtkmain.c |
| diffstat | 8 files changed, 95 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/finch.c Sun Apr 12 23:57:27 2009 +0000 +++ b/finch/finch.c Mon Apr 13 13:36:00 2009 +0000 @@ -65,6 +65,7 @@ g_hash_table_insert(ui_info, "version", VERSION); g_hash_table_insert(ui_info, "website", "http://pidgin.im"); g_hash_table_insert(ui_info, "dev_website", "http://developer.pidgin.im"); + g_hash_table_insert(ui_info, "client_type", "console"); } return ui_info;
--- a/libpurple/core.h Sun Apr 12 23:57:27 2009 +0000 +++ b/libpurple/core.h Mon Apr 13 13:36:00 2009 +0000 @@ -186,6 +186,10 @@ * * <dt><tt>dev_website</tt></dt> * <dd>the UI's development/support website, such as http://developer.pidgin.im.</dd> + * + * <dt><tt>client_type</tt></dt> + * <dd>the type of UI (pc, console, phone, handheld, web, bot)</dd> + * * </dl> * * @return A GHashTable with strings for keys and values. This
--- a/libpurple/protocols/jabber/buddy.c Sun Apr 12 23:57:27 2009 +0000 +++ b/libpurple/protocols/jabber/buddy.c Mon Apr 13 13:36:00 2009 +0000 @@ -2622,3 +2622,22 @@ return jabber_resource_has_capability(jbr, cap); } +const gchar * +jabber_resource_get_identity_category_type(const JabberBuddyResource *jbr, + const gchar *category) +{ + const GList *iter = NULL; + + if (jbr->caps) { + for (iter = jbr->caps->identities ; iter ; iter = g_list_next(iter)) { + const JabberCapsIdentity *identity = + (JabberCapsIdentity *) iter->data; + + if (strcmp(identity->category, category) == 0) { + return identity->type; + } + } + } + + return NULL; +}
--- a/libpurple/protocols/jabber/buddy.h Sun Apr 12 23:57:27 2009 +0000 +++ b/libpurple/protocols/jabber/buddy.h Mon Apr 13 13:36:00 2009 +0000 @@ -123,4 +123,8 @@ const gchar *cap); gboolean jabber_buddy_has_capability(const JabberBuddy *jb, const gchar *cap); +const gchar * +jabber_resource_get_identity_category_type(const JabberBuddyResource *jbr, + const gchar *category); + #endif /* PURPLE_JABBER_BUDDY_H_ */
--- a/libpurple/protocols/jabber/disco.c Sun Apr 12 23:57:27 2009 +0000 +++ b/libpurple/protocols/jabber/disco.c Mon Apr 13 13:36:00 2009 +0000 @@ -20,6 +20,7 @@ */ #include "internal.h" +#include "core.h" #include "prefs.h" #include "debug.h" @@ -112,11 +113,24 @@ xmlnode_set_attrib(query, "node", node); if(!node || !strcmp(node, CAPS0115_NODE "#" VERSION)) { + GHashTable *ui_info = purple_core_get_ui_info(); + const gchar *ui_type = g_hash_table_lookup(ui_info, "client_type"); + const gchar *type = "pc"; /* default client type, if unknown or + unspecified */ + + if (ui_type) { + if (strcmp(ui_type, "pc") == 0 || + strcmp(ui_type, "console") == 0 || + strcmp(ui_type, "phone") == 0 || + strcmp(ui_type, "handheld") == 0 || + strcmp(ui_type, "web") == 0 || + strcmp(ui_type, "bot") == 0) { + type = ui_type; + } + } identity = xmlnode_new_child(query, "identity"); xmlnode_set_attrib(identity, "category", "client"); - xmlnode_set_attrib(identity, "type", "pc"); /* XXX: bot, console, - * handheld, pc, phone, - * web */ + xmlnode_set_attrib(identity, "type", type); xmlnode_set_attrib(identity, "name", PACKAGE); SUPPORT_FEATURE("jabber:iq:last")
--- a/libpurple/protocols/jabber/jabber.c Sun Apr 12 23:57:27 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Mon Apr 13 13:36:00 2009 +0000 @@ -1653,7 +1653,7 @@ JabberStream *js; JabberBuddy *jb = NULL; PurpleConnection *gc = purple_account_get_connection(purple_buddy_get_account(b)); - + if(!gc) return NULL; @@ -1666,6 +1666,28 @@ !(jb->subscription & JABBER_SUB_TO))) return "not-authorized"; } + + if (jb) { + JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, NULL); + if (jbr) { + const gchar *client_type = + jabber_resource_get_identity_category_type(jbr, "client"); + + if (client_type) { + if (strcmp(client_type, "phone") == 0) { + return "mobile"; + } else if (strcmp(client_type, "web") == 0) { + return "external"; + } else if (strcmp(client_type, "handheld") == 0) { + return "hiptop"; + } else if (strcmp(client_type, "bot") == 0) { + return "bot"; + } + /* the default value "pc" falls through and has no emblem */ + } + } + } + return NULL; }
--- a/libpurple/protocols/msn/state.c Sun Apr 12 23:57:27 2009 +0000 +++ b/libpurple/protocols/msn/state.c Mon Apr 13 13:36:00 2009 +0000 @@ -21,6 +21,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ + +#include "internal.h" +#include "core.h" + #include "msn.h" #include "state.h" @@ -288,10 +292,29 @@ MsnUser *user; MsnObject *msnobj; const char *state_text; - + GHashTable *ui_info = purple_core_get_ui_info(); + MsnClientCaps caps = MSN_CLIENT_ID; + g_return_if_fail(session != NULL); g_return_if_fail(session->notification != NULL); + /* set client caps based on what the UI tells us it is... */ + if (ui_info) { + const gchar *client_type = g_hash_table_lookup(ui_info, "client_type"); + if (client_type) { + if (strcmp(client_type, "phone") == 0 || + strcmp(client_type, "handheld") == 0) { + caps |= MSN_CLIENT_CAP_WIN_MOBILE; + } else if (strcmp(client_type, "web")) { + caps |= MSN_CLIENT_CAP_WEBMSGR; + } else if (strcmp(client_type, "bot")) { + caps |= MSN_CLIENT_CAP_BOT; + } + /* MSN doesn't a "console" type... + What, they have no ncurses UI? :-) */ + } + } + account = session->account; cmdproc = session->notification->cmdproc; user = session->user; @@ -307,8 +330,7 @@ if (msnobj == NULL) { - msn_cmdproc_send(cmdproc, "CHG", "%s %d", state_text, - MSN_CLIENT_ID); + msn_cmdproc_send(cmdproc, "CHG", "%s %d", state_text, caps); } else { @@ -317,7 +339,7 @@ msnobj_str = msn_object_to_string(msnobj); msn_cmdproc_send(cmdproc, "CHG", "%s %d %s", state_text, - MSN_CLIENT_ID, purple_url_encode(msnobj_str)); + caps, purple_url_encode(msnobj_str)); g_free(msnobj_str); }
--- a/pidgin/gtkmain.c Sun Apr 12 23:57:27 2009 +0000 +++ b/pidgin/gtkmain.c Mon Apr 13 13:36:00 2009 +0000 @@ -353,6 +353,7 @@ g_hash_table_insert(ui_info, "version", VERSION); g_hash_table_insert(ui_info, "website", "http://pidgin.im"); g_hash_table_insert(ui_info, "dev_website", "http://developer.pidgin.im"); + g_hash_table_insert(ui_info, "client_type", "pc"); } return ui_info;