changeset
Update protocol IDs in codebase
Tue, 21 Jan 2014 02:37:31 +0530
- author
- Ankit Vani <a@nevitus.org>
- date
- Tue, 21 Jan 2014 02:37:31 +0530
- branch
- soc.2013.gobjectification.plugins
- changeset 37005
- 702a601fc2ca
- parent 37004
- c8dce7bef0e6
- child 37006
- 5fecec4fe589
Update protocol IDs in codebase
--- a/finch/libfinch.c Tue Jan 21 01:48:42 2014 +0530 +++ b/finch/libfinch.c Tue Jan 21 02:37:31 2014 +0530 @@ -79,7 +79,7 @@ * possible it has been re-added). AOL's old key management * page is http://developer.aim.com/manageKeys.jsp */ - g_hash_table_insert(ui_info, "protocol-aim-clientkey", "ma19sqWV9ymU6UYc"); + g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma19sqWV9ymU6UYc"); /* * This is the client key for "Pidgin." It is owned by the AIM @@ -95,15 +95,15 @@ * (ma19sqWV9ymU6UYc), but it stopped working, so we switched * to this one. */ - g_hash_table_insert(ui_info, "protocol-icq-clientkey", "ma1cSASNCKFtrdv9"); + g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma1cSASNCKFtrdv9"); /* * This is the distid for Finch, given to us by AOL. Please * don't use this for other applications. You can just not * specify a distid and libpurple will use a default. */ - g_hash_table_insert(ui_info, "protocol-aim-distid", GINT_TO_POINTER(1552)); - g_hash_table_insert(ui_info, "protocol-icq-distid", GINT_TO_POINTER(1552)); + g_hash_table_insert(ui_info, "prpl-aim-distid", GINT_TO_POINTER(1552)); + g_hash_table_insert(ui_info, "prpl-icq-distid", GINT_TO_POINTER(1552)); } return ui_info;
--- a/libpurple/accounts.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/accounts.c Tue Jan 21 02:37:31 2014 +0530 @@ -104,7 +104,7 @@ * to use the new yahoojp protocol. Also remove the account-specific settings * we no longer need */ - if(purple_strequal(purple_account_get_protocol_id(account), "yahoo")) { + if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) { if(purple_account_get_bool(account, "yahoojp", FALSE)) { const char *serverjp = purple_account_get_string(account, "serverjp", NULL); const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL); @@ -115,7 +115,7 @@ purple_account_set_string(account, "server", serverjp); purple_account_set_string(account, "xfer_host", xferjp_host); - purple_account_set_protocol_id(account, "yahoojp"); + purple_account_set_protocol_id(account, "prpl-yahoojp"); } /* these should always be nuked */ @@ -133,7 +133,7 @@ * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794' * for details on the change. */ - if(purple_strequal(purple_account_get_protocol_id(account), "icq")) { + if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) { const char *tmp = purple_account_get_string(account, "server", NULL); /* Non-secure server */ @@ -151,7 +151,7 @@ migrate_xmpp_encryption(PurpleAccount *account) { /* When this is removed, nuke the "old_ssl" and "require_tls" settings */ - if (g_str_equal(purple_account_get_protocol_id(account), "jabber")) { + if (g_str_equal(purple_account_get_protocol_id(account), "prpl-jabber")) { const char *sec = purple_account_get_string(account, "connection_security", ""); if (g_str_equal("", sec)) {
--- a/libpurple/cmds.h Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/cmds.h Tue Jan 21 02:37:31 2014 +0530 @@ -141,7 +141,7 @@ * order for the command to ever actually be called. * @param protocol_id If the #PURPLE_CMD_FLAG_PROTOCOL_ONLY flag is set, this is the id * of the protocol to which the command applies (such as - * <tt>"msn"</tt>). If the flag is not set, this parameter + * <tt>"prpl-msn"</tt>). If the flag is not set, this parameter * is ignored; pass @c NULL (or a humourous string of your * choice!). * @param func This is the function to call when someone enters this command.
--- a/libpurple/plugins/log_reader.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/plugins/log_reader.c Tue Jan 21 02:37:31 2014 +0530 @@ -630,7 +630,7 @@ g_return_val_if_fail(sn != NULL, NULL); g_return_val_if_fail(account != NULL, NULL); - if (strcmp(purple_account_get_protocol_id(account), "msn")) + if (strcmp(purple_account_get_protocol_id(account), "prpl-msn")) return NULL; logdir = purple_prefs_get_string("/plugins/core/log_reader/msn/log_directory"); @@ -1766,7 +1766,7 @@ g_return_val_if_fail(account != NULL, NULL); /* QIP only supports ICQ. */ - if (strcmp(purple_account_get_protocol_id(account), "icq")) + if (strcmp(purple_account_get_protocol_id(account), "prpl-icq")) return NULL; logdir = purple_prefs_get_string("/plugins/core/log_reader/qip/log_directory"); @@ -2221,7 +2221,7 @@ return NULL; /* aMSN only works with MSN/WLM */ - if (strcmp(purple_account_get_protocol_id(account), "msn")) + if (strcmp(purple_account_get_protocol_id(account), "prpl-msn")) return NULL; username = g_strdup(purple_normalize(account, purple_account_get_username(account)));
--- a/libpurple/plugins/signals-test.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/plugins/signals-test.c Tue Jan 21 02:37:31 2014 +0530 @@ -722,7 +722,7 @@ void *ft_handle = purple_xfers_get_handle(); void *sound_handle = purple_sounds_get_handle(); void *notify_handle = purple_notify_get_handle(); - void *jabber_handle = purple_protocols_find("jabber"); + void *jabber_handle = purple_protocols_find("prpl-jabber"); /* Accounts subsystem signals */ purple_signal_connect(accounts_handle, "account-connecting", @@ -890,7 +890,7 @@ static gboolean plugin_unload(PurplePlugin *plugin, GError **error) { - void *jabber_handle = purple_protocols_find("jabber"); + void *jabber_handle = purple_protocols_find("prpl-jabber"); purple_signals_disconnect_by_handle(plugin);
--- a/libpurple/protocols/irc/parse.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/irc/parse.c Tue Jan 21 02:37:31 2014 +0530 @@ -224,7 +224,7 @@ args[i] = '\0'; - id = purple_cmd_register(c->name, args, PURPLE_CMD_P_PROTOCOL, f, "irc", + id = purple_cmd_register(c->name, args, PURPLE_CMD_P_PROTOCOL, f, "prpl-irc", irc_parse_purple_cmd, _(c->help), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); }
--- a/libpurple/protocols/jabber/caps.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/jabber/caps.c Tue Jan 21 02:37:31 2014 +0530 @@ -973,7 +973,7 @@ for (node = accounts; node; node = node->next) { PurpleAccount *account = node->data; const char *protocol_id = purple_account_get_protocol_id(account); - if (g_str_equal("jabber", protocol_id) && purple_account_is_connected(account)) { + if (g_str_equal("prpl-jabber", protocol_id) && purple_account_is_connected(account)) { PurpleConnection *gc = purple_account_get_connection(account); jabber_presence_send(purple_connection_get_protocol_data(gc), TRUE); }
--- a/libpurple/protocols/jabber/jabber.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/jabber/jabber.c Tue Jan 21 02:37:31 2014 +0530 @@ -3628,40 +3628,40 @@ PurpleCmdId id; id = purple_cmd_register("config", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "jabber", jabber_cmd_chat_config, + "prpl-jabber", jabber_cmd_chat_config, _("config: Configure a chat room."), NULL); commands = g_slist_prepend(commands, GUINT_TO_POINTER(id)); id = purple_cmd_register("configure", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "jabber", jabber_cmd_chat_config, + "prpl-jabber", jabber_cmd_chat_config, _("configure: Configure a chat room."), NULL); commands = g_slist_prepend(commands, GUINT_TO_POINTER(id)); id = purple_cmd_register("nick", "s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "jabber", jabber_cmd_chat_nick, + "prpl-jabber", jabber_cmd_chat_nick, _("nick <new nickname>: Change your nickname."), NULL); commands = g_slist_prepend(commands, GUINT_TO_POINTER(id)); id = purple_cmd_register("part", "s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "jabber", + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_part, _("part [message]: Leave the room."), NULL); commands = g_slist_prepend(commands, GUINT_TO_POINTER(id)); id = purple_cmd_register("register", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "jabber", jabber_cmd_chat_register, + "prpl-jabber", jabber_cmd_chat_register, _("register: Register with a chat room."), NULL); commands = g_slist_prepend(commands, GUINT_TO_POINTER(id)); /* XXX: there needs to be a core /topic cmd, methinks */ id = purple_cmd_register("topic", "s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "jabber", + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_topic, _("topic [new topic]: View or change the topic."), NULL); @@ -3669,7 +3669,7 @@ id = purple_cmd_register("ban", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "jabber", + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_ban, _("ban <user> [reason]: Ban a user from the room."), NULL); @@ -3677,7 +3677,7 @@ id = purple_cmd_register("affiliate", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "jabber", + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_affiliate, _("affiliate <owner|admin|member|outcast|none> [nick1] [nick2] ...: Get the users with an affiliation or set users' affiliation with the room."), NULL); @@ -3685,7 +3685,7 @@ id = purple_cmd_register("role", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "jabber", + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_role, _("role <moderator|participant|visitor|none> [nick1] [nick2] ...: Get the users with a role or set users' role with the room."), NULL); @@ -3693,7 +3693,7 @@ id = purple_cmd_register("invite", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "jabber", + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_invite, _("invite <user> [message]: Invite a user to the room."), NULL); @@ -3701,7 +3701,7 @@ id = purple_cmd_register("join", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "jabber", + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_join, _("join: <room[@server]> [password]: Join a chat."), NULL); @@ -3709,7 +3709,7 @@ id = purple_cmd_register("kick", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "jabber", + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", jabber_cmd_chat_kick, _("kick <user> [reason]: Kick a user from the room."), NULL); @@ -3717,7 +3717,7 @@ id = purple_cmd_register("msg", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "jabber", jabber_cmd_chat_msg, + "prpl-jabber", jabber_cmd_chat_msg, _("msg <user> <message>: Send a private message to another user."), NULL); commands = g_slist_prepend(commands, GUINT_TO_POINTER(id)); @@ -3725,7 +3725,7 @@ id = purple_cmd_register("ping", "w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "jabber", jabber_cmd_ping, + "prpl-jabber", jabber_cmd_ping, _("ping <jid>: Ping a user/component/server."), NULL); commands = g_slist_prepend(commands, GUINT_TO_POINTER(id)); @@ -3733,14 +3733,14 @@ id = purple_cmd_register("buzz", "w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PROTOCOL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, - "jabber", jabber_cmd_buzz, + "prpl-jabber", jabber_cmd_buzz, _("buzz: Buzz a user to get their attention"), NULL); commands = g_slist_prepend(commands, GUINT_TO_POINTER(id)); id = purple_cmd_register("mood", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PROTOCOL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, - "jabber", jabber_cmd_mood, + "prpl-jabber", jabber_cmd_mood, _("mood <mood> [text]: Set current user mood"), NULL); commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
--- a/libpurple/protocols/msn/msn.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/msn/msn.c Tue Jan 21 02:37:31 2014 +0530 @@ -2843,7 +2843,7 @@ if (g_ascii_strcasecmp(proto, "msnim")) return FALSE; - acct = find_acct("msn", acct_id); + acct = find_acct("prpl-msn", acct_id); if (!acct) return FALSE; @@ -3067,7 +3067,7 @@ id = purple_cmd_register("nudge", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "msn", msn_cmd_nudge, + "prpl-msn", msn_cmd_nudge, _("nudge: nudge a user to get their attention"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id));
--- a/libpurple/protocols/oscar/clientlogin.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/oscar/clientlogin.c Tue Jan 21 02:37:31 2014 +0530 @@ -87,7 +87,7 @@ static const char *get_client_key(OscarData *od) { return oscar_get_ui_info_string( - od->icq ? "protocol-icq-clientkey" : "protocol-aim-clientkey", + od->icq ? "prpl-icq-clientkey" : "prpl-aim-clientkey", DEFAULT_CLIENT_KEY); } @@ -379,7 +379,7 @@ "&ts=%" PURPLE_TIME_T_MODIFIER "&useTLS=%d", purple_url_encode(token), - oscar_get_ui_info_int(od->icq ? "protocol-icq-distid" : "protocol-aim-distid", 0x00000611), + oscar_get_ui_info_int(od->icq ? "prpl-icq-distid" : "prpl-aim-distid", 0x00000611), get_client_key(od), hosttime, strcmp(encryption_type, OSCAR_NO_ENCRYPTION) != 0 ? 1 : 0);
--- a/libpurple/protocols/oscar/family_auth.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/oscar/family_auth.c Tue Jan 21 02:37:31 2014 +0530 @@ -131,7 +131,7 @@ aim_encode_password(password, password_encoded); distrib = oscar_get_ui_info_int( - od->icq ? "protocol-icq-distid" : "protocol-aim-distid", + od->icq ? "prpl-icq-distid" : "prpl-aim-distid", ci->distrib); byte_stream_put32(&frame->data, 0x00000001); /* FLAP Version */ @@ -238,7 +238,7 @@ aim_encode_password_md5(password, password_len, key, digest); distrib = oscar_get_ui_info_int( - od->icq ? "protocol-icq-distid" : "protocol-aim-distid", + od->icq ? "prpl-icq-distid" : "prpl-aim-distid", ci->distrib); aim_tlvlist_add_raw(&tlvlist, 0x0025, 16, digest);
--- a/libpurple/protocols/oscar/oscar.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/oscar/oscar.c Tue Jan 21 02:37:31 2014 +0530 @@ -724,7 +724,7 @@ } flags = PURPLE_CONNECTION_FLAG_HTML; - if (g_str_equal(purple_account_get_protocol_id(account), "icq")) { + if (g_str_equal(purple_account_get_protocol_id(account), "prpl-icq")) { od->icq = TRUE; } else { flags |= PURPLE_CONNECTION_FLAG_AUTO_RESP; @@ -732,7 +732,7 @@ /* Set this flag based on the protocol_id rather than the username, because that is what's tied to the get_moods protocol callback. */ - if (g_str_equal(purple_account_get_protocol_id(account), "icq")) + if (g_str_equal(purple_account_get_protocol_id(account), "prpl-icq")) flags |= PURPLE_CONNECTION_FLAG_SUPPORT_MOODS; purple_connection_set_flags(gc, flags); @@ -5488,11 +5488,14 @@ gboolean oscar_uri_handler(const char *proto, const char *cmd, GHashTable *params) { char *acct_id = g_hash_table_lookup(params, "account"); + char prpl[11]; PurpleAccount *acct; if (g_ascii_strcasecmp(proto, "aim") && g_ascii_strcasecmp(proto, "icq")) return FALSE; + g_snprintf(prpl, sizeof(prpl), "prpl-%s", proto); + acct = find_acct(proto, acct_id); if (!acct)
--- a/libpurple/protocols/silc/silc.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/silc/silc.c Tue Jan 21 02:37:31 2014 +0530 @@ -1928,73 +1928,73 @@ id = purple_cmd_register("part", "w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, - "silc", silcpurple_cmd_chat_part, _("part [channel]: Leave the chat"), NULL); + "prpl-silc", silcpurple_cmd_chat_part, _("part [channel]: Leave the chat"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("leave", "w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, - "silc", silcpurple_cmd_chat_part, _("leave [channel]: Leave the chat"), NULL); + "prpl-silc", silcpurple_cmd_chat_part, _("leave [channel]: Leave the chat"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("topic", "s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_chat_topic, _("topic [<new topic>]: View or change the topic"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("join", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, - "silc", silcpurple_cmd_chat_join, + "prpl-silc", silcpurple_cmd_chat_join, _("join <channel> [<password>]: Join a chat on this network"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("list", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_chat_list, _("list: List channels on this network"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("whois", "w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", + "prpl-silc", silcpurple_cmd_whois, _("whois <nick>: View nick's information"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("msg", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", silcpurple_cmd_msg, + "prpl-silc", silcpurple_cmd_msg, _("msg <nick> <message>: Send a private message to a user"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("query", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_query, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_query, _("query <nick> [<message>]: Send a private message to a user"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("motd", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_motd, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_motd, _("motd: View the server's Message Of The Day"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("detach", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", silcpurple_cmd_detach, + "prpl-silc", silcpurple_cmd_detach, _("detach: Detach this session"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("quit", "s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_quit, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_quit, _("quit [message]: Disconnect from the server, with an optional message"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("call", "s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", silcpurple_cmd_call, + "prpl-silc", silcpurple_cmd_call, _("call <command>: Call any silc client command"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); @@ -2002,98 +2002,98 @@ * with */ id = purple_cmd_register("kill", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_generic, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_generic, _("kill <nick> [-pubkey|<reason>]: Kill nick"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("nick", "w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", silcpurple_cmd_generic, + "prpl-silc", silcpurple_cmd_generic, _("nick <newnick>: Change your nickname"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("whowas", "ww", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_generic, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_generic, _("whowas <nick>: View nick's information"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("cmode", "wws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_cmode, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_cmode, _("cmode <channel> [+|-<modes>] [arguments]: Change or display channel modes"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("cumode", "wws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_generic, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_generic, _("cumode <channel> +|-<modes> <nick>: Change nick's modes on channel"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("umode", "w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", silcpurple_cmd_generic, + "prpl-silc", silcpurple_cmd_generic, _("umode <usermodes>: Set your modes in the network"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("oper", "s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", silcpurple_cmd_generic, + "prpl-silc", silcpurple_cmd_generic, _("oper <nick> [-pubkey]: Get server operator privileges"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("invite", "ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_generic, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_generic, _("invite <channel> [-|+]<nick>: invite nick or add/remove from channel invite list"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("kick", "wws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_generic, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_generic, _("kick <channel> <nick> [comment]: Kick client from channel"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("info", "w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_generic, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_generic, _("info [server]: View server administrative details"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("ban", "ww", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_generic, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_generic, _("ban [<channel> +|-<nick>]: Ban client from channel"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("getkey", "w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", silcpurple_cmd_generic, + "prpl-silc", silcpurple_cmd_generic, _("getkey <nick|server>: Retrieve client's or server's public key"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("stats", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", silcpurple_cmd_generic, + "prpl-silc", silcpurple_cmd_generic, _("stats: View server and network statistics"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("ping", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", silcpurple_cmd_generic, + "prpl-silc", silcpurple_cmd_generic, _("ping: Send PING to the connected server"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); #if 0 /* Purple doesn't handle these yet */ id = purple_cmd_register("users", "w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "silc", silcpurple_cmd_users, + "prpl-silc", silcpurple_cmd_users, _("users <channel>: List users in channel")); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("names", "ww", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "silc", silcpurple_cmd_names, + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-silc", silcpurple_cmd_names, _("names [-count|-ops|-halfops|-voices|-normal] <channel(s)>: List specific users in channel(s)")); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); #endif
--- a/libpurple/protocols/yahoo/yahoo.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/yahoo/yahoo.c Tue Jan 21 02:37:31 2014 +0530 @@ -48,26 +48,26 @@ id = purple_cmd_register("join", "s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "yahoo", yahoopurple_cmd_chat_join, + "prpl-yahoo", yahoopurple_cmd_chat_join, _("join <room>: Join a chat room on the Yahoo network"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("list", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "yahoo", yahoopurple_cmd_chat_list, + "prpl-yahoo", yahoopurple_cmd_chat_list, _("list: List rooms on the Yahoo network"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("buzz", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "yahoo", yahoopurple_cmd_buzz, + "prpl-yahoo", yahoopurple_cmd_buzz, _("buzz: Buzz a user to get their attention"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("doodle", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "yahoo", yahoo_doodle_purple_cmd_start, + "prpl-yahoo", yahoo_doodle_purple_cmd_start, _("doodle: Request user to start a Doodle session"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); }
--- a/libpurple/protocols/yahoo/yahoojp.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/yahoo/yahoojp.c Tue Jan 21 02:37:31 2014 +0530 @@ -43,26 +43,26 @@ id = purple_cmd_register("join", "s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "yahoojp", yahoopurple_cmd_chat_join, + "prpl-yahoojp", yahoopurple_cmd_chat_join, _("join <room>: Join a chat room on the Yahoo network"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("list", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "yahoojp", yahoopurple_cmd_chat_list, + "prpl-yahoojp", yahoopurple_cmd_chat_list, _("list: List rooms on the Yahoo network"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("buzz", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "yahoojp", yahoopurple_cmd_buzz, + "prpl-yahoojp", yahoopurple_cmd_buzz, _("buzz: Buzz a user to get their attention"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("doodle", "", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "yahoojp", yahoo_doodle_purple_cmd_start, + "prpl-yahoojp", yahoo_doodle_purple_cmd_start, _("doodle: Request user to start a Doodle session"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); }
--- a/libpurple/protocols/yahoo/ymsg.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/yahoo/ymsg.c Tue Jan 21 02:37:31 2014 +0530 @@ -72,7 +72,7 @@ static gboolean yahoo_is_japan(PurpleAccount *account) { - return purple_strequal(purple_account_get_protocol_id(account), "yahoojp"); + return purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoojp"); } static void yahoo_update_status(PurpleConnection *gc, const char *name, YahooFriend *f)
--- a/libpurple/protocols/zephyr/zephyr.c Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/protocols/zephyr/zephyr.c Tue Jan 21 02:37:31 2014 +0530 @@ -2721,77 +2721,77 @@ id = purple_cmd_register("msg","ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_msg, _("msg <nick> <message>: Send a private message to a user"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("zlocate","w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_zlocate, _("zlocate <nick>: Locate user"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("zl","w", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_zlocate, _("zl <nick>: Locate user"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("instance","s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_instance, _("instance <instance>: Set the instance to be used on this class"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("inst","s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_instance, _("inst <instance>: Set the instance to be used on this class"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("topic","s", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_instance, _("topic <instance>: Set the instance to be used on this class"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("sub", "www", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_joinchat_cir, _("sub <class> <instance> <recipient>: Join a new chat"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("zi","ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_zi, _("zi <instance>: Send a message to <message,<i>instance</i>,*>"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("zci","wws",PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_zci, _("zci <class> <instance>: Send a message to <<i>class</i>,<i>instance</i>,*>"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("zcir","wwws",PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_zcir, _("zcir <class> <instance> <recipient>: Send a message to <<i>class</i>,<i>instance</i>,<i>recipient</i>>"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("zir","wws",PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_zir, _("zir <instance> <recipient>: Send a message to <MESSAGE,<i>instance</i>,<i>recipient</i>>"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); id = purple_cmd_register("zc","ws", PURPLE_CMD_P_PROTOCOL, PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PROTOCOL_ONLY, - "zephyr", + "prpl-zephyr", zephyr_purple_cmd_zc, _("zc <class>: Send a message to <<i>class</i>,PERSONAL,*>"), NULL); cmds = g_slist_prepend(cmds, GUINT_TO_POINTER(id)); }
--- a/libpurple/purple-remote Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/purple-remote Tue Jan 21 02:37:31 2014 +0530 @@ -112,6 +112,8 @@ protocol = match.group(2) if protocol == "xmpp": protocol = "jabber" + if protocol is not None: + protocol = "prpl-" + protocol command = match.group(5) paramstring = match.group(7) params = {}
--- a/libpurple/purple-url-handler Tue Jan 21 01:48:42 2014 +0530 +++ b/libpurple/purple-url-handler Tue Jan 21 02:37:31 2014 +0530 @@ -119,7 +119,7 @@ def aim(uri): - protocol = "aim" + protocol = "prpl-aim" match = re.match(r"^aim:([^?]*)(\?(.*))", uri) if not match: print "Invalid aim URI: %s" % uri @@ -145,7 +145,7 @@ addbuddy(account, screenname, params.get("group", "")) def gg(uri): - protocol = "gg" + protocol = "prpl-gg" match = re.match(r"^gg:(.*)", uri) if not match: print "Invalid gg URI: %s" % uri @@ -156,7 +156,7 @@ goim(account, screenname) def icq(uri): - protocol = "icq" + protocol = "prpl-icq" match = re.match(r"^icq:([^?]*)(\?(.*))", uri) if not match: print "Invalid icq URI: %s" % uri @@ -182,7 +182,7 @@ addbuddy(account, screenname, params.get("group", "")) def irc(uri): - protocol = "irc" + protocol = "prpl-irc" match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri) if not match: print "Invalid irc URI: %s" % uri @@ -222,7 +222,7 @@ gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg")) def msnim(uri): - protocol = "msn" + protocol = "prpl-msn" match = re.match(r"^msnim:([^?]*)(\?(.*))", uri) if not match: print "Invalid msnim URI: %s" % uri @@ -245,12 +245,12 @@ addbuddy(account, screenname) def myim(uri): - protocol = "myspace" + protocol = "prpl-myspace" print "TODO: send uri: ", uri assert False, "Not implemented" def sip(uri): - protocol = "simple" + protocol = "prpl-simple" match = re.match(r"^sip:(.*)", uri) if not match: print "Invalid sip URI: %s" % uri @@ -261,7 +261,7 @@ goim(account, screenname) def xmpp(uri): - protocol = "jabber" + protocol = "prpl-jabber" match = re.match(r"^xmpp:(//([^/?#]*)/?)?([^?#]*)(\?([^;#]*)(;([^#]*))?)?(#(.*))?", uri) if not match: print "Invalid xmpp URI: %s" % uri @@ -301,7 +301,7 @@ goim(account, screenname) def gtalk(uri): - protocol = "jabber" + protocol = "prpl-jabber" match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri) if not match: print "Invalid gtalk URI: %s" % uri @@ -326,7 +326,7 @@ goim(account, jid) def ymsgr(uri): - protocol = "yahoo" + protocol = "prpl-yahoo" match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri) if not match: print "Invalid ymsgr URI: %s" % uri
--- a/pidgin/gtkblist.c Tue Jan 21 01:48:42 2014 +0530 +++ b/pidgin/gtkblist.c Tue Jan 21 02:37:31 2014 +0530 @@ -2214,11 +2214,11 @@ return FALSE; } - add_buddies_from_vcard("aim", group, aims, alias); - add_buddies_from_vcard("icq", group, icqs, alias); - add_buddies_from_vcard("yahoo", group, yahoos, alias); - add_buddies_from_vcard("msn", group, msns, alias); - add_buddies_from_vcard("jabber", group, jabbers, alias); + add_buddies_from_vcard("prpl-aim", group, aims, alias); + add_buddies_from_vcard("prpl-icq", group, icqs, alias); + add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias); + add_buddies_from_vcard("prpl-msn", group, msns, alias); + add_buddies_from_vcard("prpl-jabber", group, jabbers, alias); g_free(alias);
--- a/pidgin/libpidgin.c Tue Jan 21 01:48:42 2014 +0530 +++ b/pidgin/libpidgin.c Tue Jan 21 02:37:31 2014 +0530 @@ -343,16 +343,16 @@ * possible it has been re-added). AOL's old key management * page is http://developer.aim.com/manageKeys.jsp */ - g_hash_table_insert(ui_info, "protocol-aim-clientkey", "ma1cSASNCKFtrdv9"); - g_hash_table_insert(ui_info, "protocol-icq-clientkey", "ma1cSASNCKFtrdv9"); + g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma1cSASNCKFtrdv9"); + g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma1cSASNCKFtrdv9"); /* * This is the distid for Pidgin, given to us by AOL. Please * don't use this for other applications. You can just not * specify a distid and libpurple will use a default. */ - g_hash_table_insert(ui_info, "protocol-aim-distid", GINT_TO_POINTER(1550)); - g_hash_table_insert(ui_info, "protocol-icq-distid", GINT_TO_POINTER(1550)); + g_hash_table_insert(ui_info, "prpl-aim-distid", GINT_TO_POINTER(1550)); + g_hash_table_insert(ui_info, "prpl-icq-distid", GINT_TO_POINTER(1550)); } return ui_info;
--- a/pidgin/plugins/disco/xmppdisco.h Tue Jan 21 01:48:42 2014 +0530 +++ b/pidgin/plugins/disco/xmppdisco.h Tue Jan 21 02:37:31 2014 +0530 @@ -26,7 +26,7 @@ #include "gtkdisco.h" -#define XMPP_PROTOCOL_ID "jabber" +#define XMPP_PROTOCOL_ID "prpl-jabber" #define NS_DISCO_INFO "http://jabber.org/protocol/disco#info" #define NS_DISCO_ITEMS "http://jabber.org/protocol/disco#items" #define NS_MUC "http://jabber.org/protocol/muc"
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c Tue Jan 21 01:48:42 2014 +0530 +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Tue Jan 21 02:37:31 2014 +0530 @@ -315,13 +315,13 @@ } else { - add_ims(dialog, contact, name, aims, "aim"); - add_ims(dialog, contact, name, jabbers, "jabber"); - add_ims(dialog, contact, name, yahoos, "yahoo"); - add_ims(dialog, contact, name, msns, "msn"); - add_ims(dialog, contact, name, icqs, "icq"); - add_ims(dialog, contact, name, novells, "novell"); - add_ims(dialog, contact, name, ggs, "gg"); + add_ims(dialog, contact, name, aims, "prpl-aim"); + add_ims(dialog, contact, name, jabbers, "prpl-jabber"); + add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); + add_ims(dialog, contact, name, msns, "prpl-msn"); + add_ims(dialog, contact, name, icqs, "prpl-icq"); + add_ims(dialog, contact, name, novells, "prpl-novell"); + add_ims(dialog, contact, name, ggs, "prpl-gg"); } } @@ -400,13 +400,13 @@ } else { - add_ims(dialog, contact, name, aims, "aim"); - add_ims(dialog, contact, name, jabbers, "jabber"); - add_ims(dialog, contact, name, yahoos, "yahoo"); - add_ims(dialog, contact, name, msns, "msn"); - add_ims(dialog, contact, name, icqs, "icq"); - add_ims(dialog, contact, name, novells, "novell"); - add_ims(dialog, contact, name, ggs, "gg"); + add_ims(dialog, contact, name, aims, "prpl-aim"); + add_ims(dialog, contact, name, jabbers, "prpl-jabber"); + add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); + add_ims(dialog, contact, name, msns, "prpl-msn"); + add_ims(dialog, contact, name, icqs, "prpl-icq"); + add_ims(dialog, contact, name, novells, "prpl-novell"); + add_ims(dialog, contact, name, ggs, "prpl-gg"); } } }
--- a/pidgin/plugins/gevolution/gevo-util.c Tue Jan 21 01:48:42 2014 +0530 +++ b/pidgin/plugins/gevolution/gevo-util.c Tue Jan 21 02:37:31 2014 +0530 @@ -99,19 +99,19 @@ protocol_id = purple_account_get_protocol_id(account); - if (!strcmp(protocol_id, "aim")) + if (!strcmp(protocol_id, "prpl-aim")) protocol_field = E_CONTACT_IM_AIM; - else if (!strcmp(protocol_id, "icq")) + else if (!strcmp(protocol_id, "prpl-icq")) protocol_field = E_CONTACT_IM_ICQ; - else if (!strcmp(protocol_id, "msn")) + else if (!strcmp(protocol_id, "prpl-msn")) protocol_field = E_CONTACT_IM_MSN; - else if (!strcmp(protocol_id, "yahoo")) + else if (!strcmp(protocol_id, "prpl-yahoo")) protocol_field = E_CONTACT_IM_YAHOO; - else if (!strcmp(protocol_id, "jabber")) + else if (!strcmp(protocol_id, "prpl-jabber")) protocol_field = E_CONTACT_IM_JABBER; - else if (!strcmp(protocol_id, "novell")) + else if (!strcmp(protocol_id, "prpl-novell")) protocol_field = E_CONTACT_IM_GROUPWISE; - else if (!strcmp(protocol_id, "gg")) + else if (!strcmp(protocol_id, "prpl-gg")) protocol_field = E_CONTACT_IM_GADUGADU; return protocol_field; @@ -170,12 +170,12 @@ PurpleAccount *account = purple_buddy_get_account(buddy); const char *protocol_id = purple_account_get_protocol_id(account); - if (!strcmp(protocol_id, "msn")) + if (!strcmp(protocol_id, "prpl-msn")) { mail = g_strdup(purple_normalize(account, purple_buddy_get_name(buddy))); } - else if (!strcmp(protocol_id, "yahoo")) + else if (!strcmp(protocol_id, "prpl-yahoo")) { mail = g_strdup_printf("%s@yahoo.com", purple_normalize(account,
--- a/pidgin/plugins/gevolution/gevolution.c Tue Jan 21 01:48:42 2014 +0530 +++ b/pidgin/plugins/gevolution/gevolution.c Tue Jan 21 02:37:31 2014 +0530 @@ -119,13 +119,13 @@ name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); - update_ims_from_contact(contact, name, "aim", E_CONTACT_IM_AIM); - update_ims_from_contact(contact, name, "jabber", E_CONTACT_IM_JABBER); - update_ims_from_contact(contact, name, "yahoo", E_CONTACT_IM_YAHOO); - update_ims_from_contact(contact, name, "msn", E_CONTACT_IM_MSN); - update_ims_from_contact(contact, name, "icq", E_CONTACT_IM_ICQ); - update_ims_from_contact(contact, name, "novell", E_CONTACT_IM_GROUPWISE); - update_ims_from_contact(contact, name, "gg", E_CONTACT_IM_GADUGADU); + update_ims_from_contact(contact, name, "prpl-aim", E_CONTACT_IM_AIM); + update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER); + update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO); + update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN); + update_ims_from_contact(contact, name, "prpl-icq", E_CONTACT_IM_ICQ); + update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE); + update_ims_from_contact(contact, name, "prpl-gg", E_CONTACT_IM_GADUGADU); } static void
--- a/pidgin/plugins/gevolution/new_person_dialog.c Tue Jan 21 01:48:42 2014 +0530 +++ b/pidgin/plugins/gevolution/new_person_dialog.c Tue Jan 21 02:37:31 2014 +0530 @@ -141,19 +141,19 @@ if (*email) e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email); - if (!strcmp(im_service, "aim")) + if (!strcmp(im_service, "prpl-aim")) field = E_CONTACT_IM_AIM; - else if (!strcmp(im_service, "icq")) + else if (!strcmp(im_service, "prpl-icq")) field = E_CONTACT_IM_ICQ; - else if (!strcmp(im_service, "yahoo")) + else if (!strcmp(im_service, "prpl-yahoo")) field = E_CONTACT_IM_YAHOO; - else if (!strcmp(im_service, "jabber")) + else if (!strcmp(im_service, "prpl-jabber")) field = E_CONTACT_IM_JABBER; - else if (!strcmp(im_service, "msn")) + else if (!strcmp(im_service, "prpl-msn")) field = E_CONTACT_IM_MSN; - else if (!strcmp(im_service, "novell")) + else if (!strcmp(im_service, "prpl-novell")) field = E_CONTACT_IM_GROUPWISE; - else if (!strcmp(im_service, "gg")) + else if (!strcmp(im_service, "prpl-gg")) field = E_CONTACT_IM_GADUGADU; if (field > 0)
--- a/pidgin/plugins/raw.c Tue Jan 21 01:48:42 2014 +0530 +++ b/pidgin/plugins/raw.c Tue Jan 21 02:37:31 2014 +0530 @@ -72,7 +72,7 @@ purple_debug_misc("raw", "protocol_id = %s\n", protocol_id); - if (strcmp(protocol_id, "toc") == 0) { + if (strcmp(protocol_id, "prpl-toc") == 0) { int *a = (int *)purple_connection_get_protocol_data(gc); unsigned short seqno = htons(a[1]++ & 0xffff); unsigned short len = htons(strlen(txt) + 1); @@ -82,19 +82,19 @@ write(*a, txt, ntohs(len)); purple_debug(PURPLE_DEBUG_MISC, "raw", "TOC C: %s\n", txt); - } else if (strcmp(protocol_id, "msn") == 0) { + } else if (strcmp(protocol_id, "prpl-msn") == 0) { MsnSession *session = purple_connection_get_protocol_data(gc); char buf[strlen(txt) + 3]; g_snprintf(buf, sizeof(buf), "%s\r\n", txt); msn_servconn_write(session->notification->servconn, buf, strlen(buf)); - } else if (strcmp(protocol_id, "irc") == 0) { + } else if (strcmp(protocol_id, "prpl-irc") == 0) { write(*(int *)purple_connection_get_protocol_data(gc), txt, strlen(txt)); write(*(int *)purple_connection_get_protocol_data(gc), "\r\n", 2); purple_debug(PURPLE_DEBUG_MISC, "raw", "IRC C: %s\n", txt); - } else if (strcmp(protocol_id, "jabber") == 0) { + } else if (strcmp(protocol_id, "prpl-jabber") == 0) { jabber_send_raw((JabberStream *)purple_connection_get_protocol_data(gc), txt, -1); } else {
--- a/pidgin/plugins/xmppconsole.c Tue Jan 21 01:48:42 2014 +0530 +++ b/pidgin/plugins/xmppconsole.c Tue Jan 21 02:37:31 2014 +0530 @@ -659,7 +659,7 @@ return; account = purple_connection_get_account(gc); - if (strcmp(purple_account_get_protocol_id(account), "jabber")) + if (strcmp(purple_account_get_protocol_id(account), "prpl-jabber")) return; gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(console->dropdown), @@ -756,7 +756,7 @@ console->dropdown = gtk_combo_box_text_new(); for (connections = purple_connections_get_all(); connections; connections = connections->next) { PurpleConnection *gc = connections->data; - if (!strcmp(purple_account_get_protocol_id(purple_connection_get_account(gc)), "jabber")) { + if (!strcmp(purple_account_get_protocol_id(purple_connection_get_account(gc)), "prpl-jabber")) { console->count++; console->accounts = g_list_append(console->accounts, gc); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(console->dropdown), @@ -856,7 +856,7 @@ { PurpleProtocol *jabber; - jabber = purple_protocols_find("jabber"); + jabber = purple_protocols_find("prpl-jabber"); if (!jabber) { g_set_error(error, PLUGIN_DOMAIN, 0, _("XMPP protocol is not loaded.")); return FALSE;
