/soc/2013/ankitkv/gobjectification: 702a601fc2ca: Update protoco...
Ankit Vani
a at nevitus.org
Mon Jan 20 16:59:40 EST 2014
Changeset: 702a601fc2cafd90dd814381b91e118c19555d05
Author: Ankit Vani <a at nevitus.org>
Date: 2014-01-21 02:37 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/702a601fc2ca
Description:
Update protocol IDs in codebase
diffstat:
finch/libfinch.c | 8 +-
libpurple/accounts.c | 8 +-
libpurple/cmds.h | 2 +-
libpurple/plugins/log_reader.c | 6 +-
libpurple/plugins/signals-test.c | 4 +-
libpurple/protocols/irc/parse.c | 2 +-
libpurple/protocols/jabber/caps.c | 2 +-
libpurple/protocols/jabber/jabber.c | 32 +++++++-------
libpurple/protocols/msn/msn.c | 4 +-
libpurple/protocols/oscar/clientlogin.c | 4 +-
libpurple/protocols/oscar/family_auth.c | 4 +-
libpurple/protocols/oscar/oscar.c | 7 ++-
libpurple/protocols/silc/silc.c | 56 +++++++++++++-------------
libpurple/protocols/yahoo/yahoo.c | 8 +-
libpurple/protocols/yahoo/yahoojp.c | 8 +-
libpurple/protocols/yahoo/ymsg.c | 2 +-
libpurple/protocols/zephyr/zephyr.c | 24 +++++-----
libpurple/purple-remote | 2 +
libpurple/purple-url-handler | 20 ++++----
pidgin/gtkblist.c | 10 ++--
pidgin/libpidgin.c | 8 +-
pidgin/plugins/disco/xmppdisco.h | 2 +-
pidgin/plugins/gevolution/add_buddy_dialog.c | 28 ++++++------
pidgin/plugins/gevolution/gevo-util.c | 18 ++++----
pidgin/plugins/gevolution/gevolution.c | 14 +++---
pidgin/plugins/gevolution/new_person_dialog.c | 14 +++---
pidgin/plugins/raw.c | 8 +-
pidgin/plugins/xmppconsole.c | 6 +-
28 files changed, 158 insertions(+), 153 deletions(-)
diffs (truncated from 1139 to 300 lines):
diff --git a/finch/libfinch.c b/finch/libfinch.c
--- a/finch/libfinch.c
+++ b/finch/libfinch.c
@@ -79,7 +79,7 @@ static GHashTable *finch_ui_get_info(voi
* 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 @@ static GHashTable *finch_ui_get_info(voi
* (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;
diff --git a/libpurple/accounts.c b/libpurple/accounts.c
--- a/libpurple/accounts.c
+++ b/libpurple/accounts.c
@@ -104,7 +104,7 @@ migrate_yahoo_japan(PurpleAccount *accou
* 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 @@ migrate_yahoo_japan(PurpleAccount *accou
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 @@ migrate_icq_server(PurpleAccount *accoun
* '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 @@ static void
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)) {
diff --git a/libpurple/cmds.h b/libpurple/cmds.h
--- a/libpurple/cmds.h
+++ b/libpurple/cmds.h
@@ -141,7 +141,7 @@ G_BEGIN_DECLS
* 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.
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -630,7 +630,7 @@ static GList *msn_logger_list(PurpleLogT
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 @@ static GList *qip_logger_list(PurpleLogT
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 @@ static GList *amsn_logger_list(PurpleLog
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)));
diff --git a/libpurple/plugins/signals-test.c b/libpurple/plugins/signals-test.c
--- a/libpurple/plugins/signals-test.c
+++ b/libpurple/plugins/signals-test.c
@@ -722,7 +722,7 @@ plugin_load(PurplePlugin *plugin, GError
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 @@ plugin_load(PurplePlugin *plugin, GError
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);
diff --git a/libpurple/protocols/irc/parse.c b/libpurple/protocols/irc/parse.c
--- a/libpurple/protocols/irc/parse.c
+++ b/libpurple/protocols/irc/parse.c
@@ -224,7 +224,7 @@ static void irc_register_command(struct
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));
}
diff --git a/libpurple/protocols/jabber/caps.c b/libpurple/protocols/jabber/caps.c
--- a/libpurple/protocols/jabber/caps.c
+++ b/libpurple/protocols/jabber/caps.c
@@ -973,7 +973,7 @@ void jabber_caps_broadcast_change()
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);
}
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -3628,40 +3628,40 @@ static void jabber_register_commands(Pur
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 @@ static void jabber_register_commands(Pur
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 @@ static void jabber_register_commands(Pur
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 @@ static void jabber_register_commands(Pur
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 @@ static void jabber_register_commands(Pur
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 @@ static void jabber_register_commands(Pur
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 @@ static void jabber_register_commands(Pur
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 @@ static void jabber_register_commands(Pur
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 @@ static void jabber_register_commands(Pur
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 @@ static void jabber_register_commands(Pur
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));
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -2843,7 +2843,7 @@ static gboolean msn_uri_handler(const ch
More information about the Commits
mailing list