Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/bonjour/bonjour.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/bonjour/bonjour.c	Sun Sep 01 15:57:38 2013 +0530
@@ -635,8 +635,8 @@
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 	PurpleAccountOption *option;
 
-	proto_class->id        = BONJOUR_ID;
-	proto_class->name      = BONJOUR_NAME;
+	proto_class->id        = "bonjour";
+	proto_class->name      = "Bonjour";
 	proto_class->options   = OPT_PROTO_NO_PASSWORD;
 	proto_class->icon_spec = purple_buddy_icon_spec_new("png,gif,jpeg",
 	                                                 0, 0, 96, 96, 65535,
@@ -701,8 +701,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           BONJOUR_ID,
-		"name",         BONJOUR_NAME,
+		"id",           "protocol-bonjour",
+		"name",         "Bonjour Protocol",
 		"version",      DISPLAY_VERSION,
 		"category",     N_("Protocol"),
 		"summary",      N_("Bonjour Protocol Plugin"),

--- a/libpurple/protocols/bonjour/bonjour.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/bonjour/bonjour.h	Sun Sep 01 15:57:38 2013 +0530
@@ -36,9 +36,6 @@
 #define BONJOUR_PROTOCOL_NAME "bonjour"
 #define BONJOUR_ICON_NAME "bonjour"
 
-#define BONJOUR_ID     "bonjour"
-#define BONJOUR_NAME   "Bonjour"
-
 #define BONJOUR_STATUS_ID_OFFLINE   "offline"
 #define BONJOUR_STATUS_ID_AVAILABLE "available"
 #define BONJOUR_STATUS_ID_AWAY      "away"

--- a/libpurple/protocols/gg/gg.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/gg/gg.c	Sun Sep 01 15:57:38 2013 +0530
@@ -1408,8 +1408,8 @@
 	PurpleAccountOption *ggp_server_option;
 	GList *encryption_options = NULL;
 
-	proto_class->id        = GGP_ID;
-	proto_class->name      = GGP_NAME;
+	proto_class->id        = "gg";
+	proto_class->name      = "Gadu-Gadu";
 	proto_class->options   = OPT_PROTO_REGISTER_NOSCREENNAME |
 	                         OPT_PROTO_IM_IMAGE;
 	proto_class->icon_spec = purple_buddy_icon_spec_new("png",
@@ -1503,8 +1503,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           GGP_ID,
-		"name",         GGP_NAME,
+		"id",           "protocol-gg",
+		"name",         "Gadu-Gadu Protocol",
 		"version",      DISPLAY_VERSION,
 		"category",     N_("Protocol"),
 		"summary",      N_("Gadu-Gadu Protocol Plugin"),

--- a/libpurple/protocols/gg/gg.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/gg/gg.h	Sun Sep 01 15:57:38 2013 +0530
@@ -40,9 +40,6 @@
 
 #define GGP_UIN_LEN_MAX 10
 
-#define GGP_ID     "gg"
-#define GGP_NAME   "Gadu-Gadu"
-
 #define GGP_TYPE_PROTOCOL             (ggp_protocol_get_type())
 #define GGP_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), GGP_TYPE_PROTOCOL, GaduGaduProtocol))
 #define GGP_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), GGP_TYPE_PROTOCOL, GaduGaduProtocolClass))

--- a/libpurple/protocols/irc/irc.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/irc/irc.c	Sun Sep 01 15:57:38 2013 +0530
@@ -930,8 +930,8 @@
 	PurpleAccountUserSplit *split;
 	PurpleAccountOption *option;
 
-	proto_class->id        = IRC_ID;
-	proto_class->name      = IRC_NAME;
+	proto_class->id        = "irc";
+	proto_class->name      = "IRC";
 	proto_class->options   = OPT_PROTO_CHAT_TOPIC | OPT_PROTO_PASSWORD_OPTIONAL
 	                         | OPT_PROTO_SLASH_COMMANDS_NATIVE;
 
@@ -1023,8 +1023,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           IRC_ID,
-		"name",         IRC_NAME,
+		"id",           "protocol-irc",
+		"name",         "IRC Protocol",
 		"version",      DISPLAY_VERSION,
 		"category",     N_("Protocol"),
 		"summary",      N_("IRC Protocol Plugin"),

--- a/libpurple/protocols/irc/irc.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/irc/irc.h	Sun Sep 01 15:57:38 2013 +0530
@@ -34,9 +34,6 @@
 #include "roomlist.h"
 #include "sslconn.h"
 
-#define IRC_ID     "irc"
-#define IRC_NAME   "IRC"
-
 #define IRC_TYPE_PROTOCOL             (irc_protocol_get_type())
 #define IRC_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), IRC_TYPE_PROTOCOL, IRCProtocol))
 #define IRC_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), IRC_TYPE_PROTOCOL, IRCProtocolClass))

--- a/libpurple/protocols/jabber/jabber.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/jabber/jabber.c	Sun Sep 01 15:57:38 2013 +0530
@@ -4065,8 +4065,8 @@
 {
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 
-	proto_class->id        = JABBER_ID;
-	proto_class->name      = JABBER_NAME;
+	proto_class->id        = "jabber";
+	proto_class->name      = "XMPP";
 	proto_class->options   = OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME |
 	                         OPT_PROTO_MAIL_CHECK |
 #ifdef HAVE_CYRUS_SASL

--- a/libpurple/protocols/jabber/jabber.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/jabber/jabber.h	Sun Sep 01 15:57:38 2013 +0530
@@ -82,9 +82,6 @@
 
 #define CAPS0115_NODE "https://pidgin.im/"
 
-#define JABBER_ID    "jabber"
-#define JABBER_NAME  "XMPP"
-
 #define JABBER_TYPE_PROTOCOL             (jabber_protocol_get_type())
 #define JABBER_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), JABBER_TYPE_PROTOCOL, JabberProtocol))
 #define JABBER_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), JABBER_TYPE_PROTOCOL, JabberProtocolClass))

--- a/libpurple/protocols/jabber/libfacebook.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/jabber/libfacebook.c	Sun Sep 01 15:57:38 2013 +0530
@@ -112,8 +112,8 @@
 	PurpleAccountOption *option;
 	GList *encryption_values = NULL;
 
-	proto_class->id        = FACEBOOK_ID;
-	proto_class->name      = FACEBOOK_NAME;
+	proto_class->id        = "facebook-xmpp";
+	proto_class->name      = "Facebook (XMPP)";
 
 	/* Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im */
 	split = purple_account_user_split_new(_("Domain"), "chat.facebook.com", '@');
@@ -204,15 +204,15 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",            FACEBOOK_ID,
-		"name",          FACEBOOK_NAME,
+		"id",            "protocol-facebook-",
+		"name",          "Facebook XMPP Protocol",
 		"version",       DISPLAY_VERSION,
 		"category",      N_("Protocol"),
 		"summary",       N_("Facebook XMPP Protocol Plugin"),
 		"description",   N_("Facebook XMPP Protocol Plugin"),
 		"website",       PURPLE_WEBSITE,
 		"abi-version",   PURPLE_ABI_VERSION,
-		"dependencies",  JABBER_ID,
+		"dependencies",  "protocol-xmpp",
 		"flags",         GPLUGIN_PLUGIN_INFO_FLAGS_INTERNAL |
 		                 GPLUGIN_PLUGIN_INFO_FLAGS_LOAD_ON_QUERY,
 		NULL

--- a/libpurple/protocols/jabber/libfacebook.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/jabber/libfacebook.h	Sun Sep 01 15:57:38 2013 +0530
@@ -24,9 +24,6 @@
 
 #include "jabber.h"
 
-#define FACEBOOK_ID     "facebook-xmpp"
-#define FACEBOOK_NAME   "Facebook (XMPP)"
-
 #define FACEBOOK_TYPE_PROTOCOL             (facebook_protocol_get_type())
 #define FACEBOOK_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), FACEBOOK_TYPE_PROTOCOL, FacebookProtocol))
 #define FACEBOOK_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), FACEBOOK_TYPE_PROTOCOL, FacebookProtocolClass))

--- a/libpurple/protocols/jabber/libgtalk.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/jabber/libgtalk.c	Sun Sep 01 15:57:38 2013 +0530
@@ -112,8 +112,8 @@
 	PurpleAccountOption *option;
 	GList *encryption_values = NULL;
 
-	proto_class->id        = GTALK_ID;
-	proto_class->name      = GTALK_NAME;
+	proto_class->id        = "gtalk";
+	proto_class->name      = "Google Talk (XMPP)";
 
 	/* Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im */
 	split = purple_account_user_split_new(_("Domain"), "gmail.com", '@');
@@ -197,15 +197,15 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",            GTALK_ID,
-		"name",          GTALK_NAME,
+		"id",            "protocol-gtalk",
+		"name",          "Google Talk Protocol",
 		"version",       DISPLAY_VERSION,
 		"category",      N_("Protocol"),
 		"summary",       N_("Google Talk Protocol Plugin"),
 		"description",   N_("Google Talk Protocol Plugin"),
 		"website",       PURPLE_WEBSITE,
 		"abi-version",   PURPLE_ABI_VERSION,
-		"dependencies",  JABBER_ID,
+		"dependencies",  "protocol-xmpp",
 		"flags",         GPLUGIN_PLUGIN_INFO_FLAGS_INTERNAL |
 		                 GPLUGIN_PLUGIN_INFO_FLAGS_LOAD_ON_QUERY,
 		NULL

--- a/libpurple/protocols/jabber/libgtalk.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/jabber/libgtalk.h	Sun Sep 01 15:57:38 2013 +0530
@@ -24,9 +24,6 @@
 
 #include "jabber.h"
 
-#define GTALK_ID     "gtalk"
-#define GTALK_NAME   "Google Talk (XMPP)"
-
 #define GTALK_TYPE_PROTOCOL             (gtalk_protocol_get_type())
 #define GTALK_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), GTALK_TYPE_PROTOCOL, GTalkProtocol))
 #define GTALK_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), GTALK_TYPE_PROTOCOL, GTalkProtocolClass))

--- a/libpurple/protocols/jabber/libxmpp.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/jabber/libxmpp.c	Sun Sep 01 15:57:38 2013 +0530
@@ -181,8 +181,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           JABBER_ID,
-		"name",         JABBER_NAME,
+		"id",           "protocol-xmpp",
+		"name",         "XMPP Protocol",
 		"version",      DISPLAY_VERSION,
 		"category",     N_("Protocol"),
 		"summary",      N_("XMPP Protocol Plugin"),

--- a/libpurple/protocols/msn/msn.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/msn/msn.c	Sun Sep 01 15:57:38 2013 +0530
@@ -2880,8 +2880,8 @@
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 	PurpleAccountOption *option;
 
-	proto_class->id        = MSN_ID;
-	proto_class->name      = MSN_NAME;
+	proto_class->id        = "msn";
+	proto_class->name      = "MSN";
 	proto_class->options   = OPT_PROTO_MAIL_CHECK | OPT_PROTO_INVITE_MESSAGE;
 	proto_class->icon_spec = purple_buddy_icon_spec_new("png,gif",
 	                                                    0, 0, 96, 96, 0,
@@ -2990,8 +2990,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           MSN_ID,
-		"name",         MSN_NAME,
+		"id",           "protocol-msn",
+		"name",         "MSN Protocol",
 		"version",      DISPLAY_VERSION,
 		"category",     N_("Protocol"),
 		"summary",      N_("Windows Live Messenger Protocol Plugin"),

--- a/libpurple/protocols/msn/msn.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/msn/msn.h	Sun Sep 01 15:57:38 2013 +0530
@@ -118,9 +118,7 @@
 
 #define MSN_BUF_LEN 8192
 
-#define MSN_ID     "msn"
-#define MSN_NAME   "MSN"
-#define MSN_DOMAIN (g_quark_from_static_string(MSN_ID))
+#define MSN_DOMAIN (g_quark_from_static_string("msn"))
 
 /* Windows Live Messenger Server*/
 #define MSN_SERVER "messenger.hotmail.com"

--- a/libpurple/protocols/mxit/mxit.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/mxit/mxit.c	Sun Sep 01 15:57:38 2013 +0530
@@ -729,8 +729,8 @@
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 	PurpleAccountOption *option;
 
-	proto_class->id        = MXIT_PLUGIN_ID;
-	proto_class->name      = MXIT_PLUGIN_NAME;
+	proto_class->id        = MXIT_PROTOCOL_ID;
+	proto_class->name      = MXIT_PROTOCOL_NAME;
 	proto_class->options   = OPT_PROTO_REGISTER_NOSCREENNAME |
 	                         OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_IM_IMAGE |
 	                         OPT_PROTO_INVITE_MESSAGE |

--- a/libpurple/protocols/mxit/mxit.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/mxit/mxit.h	Sun Sep 01 15:57:38 2013 +0530
@@ -61,9 +61,14 @@
 #include	"profile.h"
 
 
+/* Protocol details */
+#define		MXIT_PROTOCOL_ID			"loubserp-mxit"
+#define		MXIT_PROTOCOL_NAME			"MXit"
+
+
 /* Plugin details */
-#define		MXIT_PLUGIN_ID				"loubserp-mxit"
-#define		MXIT_PLUGIN_NAME			"MXit"
+#define		MXIT_PLUGIN_ID				"protocol-mxit"
+#define		MXIT_PLUGIN_NAME			"MXit Protocol"
 #define		MXIT_PLUGIN_CATEGORY		"Protocol"
 #define		MXIT_PLUGIN_AUTHOR			"Pieter Loubser <libpurple@mxit.com>"
 #define		MXIT_PLUGIN_WWW				"http://www.mxit.com"

--- a/libpurple/protocols/myspace/myspace.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/myspace/myspace.c	Sun Sep 01 15:57:38 2013 +0530
@@ -3387,8 +3387,8 @@
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 	PurpleAccountOption *option;
 
-	proto_class->id        = MSIM_ID;
-	proto_class->name      = MSIM_NAME;
+	proto_class->id        = "myspace";
+	proto_class->name      = "MySpaceIM";
 	proto_class->options   = OPT_PROTO_USE_POINTSIZE /* specify font size in sane point size */
 	                         | OPT_PROTO_MAIL_CHECK;
 	                      /* | OPT_PROTO_IM_IMAGE - TODO: direct images. */
@@ -3465,8 +3465,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           MSIM_ID,
-		"name",         MSIM_NAME,
+		"id",           "protocol-myspace",
+		"name",         "MySpaceIM Protocol",
 		"version",      MSIM_PROTOCOL_VERSION_STRING,
 		"category",     "Protocol",
 		"summary",      "MySpaceIM Protocol Plugin",

--- a/libpurple/protocols/myspace/myspace.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/myspace/myspace.h	Sun Sep 01 15:57:38 2013 +0530
@@ -61,9 +61,6 @@
 #include "markup.h"
 #include "user.h"
 
-#define MSIM_ID     "myspace"
-#define MSIM_NAME   "MySpaceIM"
-
 #define MSIM_TYPE_PROTOCOL             (msim_protocol_get_type())
 #define MSIM_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), MSIM_TYPE_PROTOCOL, MySpaceProtocol))
 #define MSIM_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), MSIM_TYPE_PROTOCOL, MySpaceProtocolClass))

--- a/libpurple/protocols/novell/novell.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/novell/novell.c	Sun Sep 01 15:57:38 2013 +0530
@@ -3490,8 +3490,8 @@
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 	PurpleAccountOption *option;
 
-	proto_class->id        = NOVELL_ID;
-	proto_class->name      = NOVELL_NAME;
+	proto_class->id        = "novell";
+	proto_class->name      = "GroupWise";
 
 	option = purple_account_option_string_new(_("Server address"), "server", NULL);
 	proto_class->protocol_options =
@@ -3543,8 +3543,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           NOVELL_ID,
-		"name",         NOVELL_NAME,
+		"id",           "protocol-novell",
+		"name",         "Novell GroupWise Protocol",
 		"version",      DISPLAY_VERSION,
 		"category",     N_("Protocol"),
 		"summary",      N_("Novell GroupWise Messenger Protocol Plugin"),

--- a/libpurple/protocols/novell/novell.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/novell/novell.h	Sun Sep 01 15:57:38 2013 +0530
@@ -24,9 +24,6 @@
 
 #include "protocol.h"
 
-#define NOVELL_ID     "novell"
-#define NOVELL_NAME   "GroupWise"
-
 #define NOVELL_TYPE_PROTOCOL             (novell_protocol_get_type())
 #define NOVELL_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), NOVELL_TYPE_PROTOCOL, NovellProtocol))
 #define NOVELL_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), NOVELL_TYPE_PROTOCOL, NovellProtocolClass))

--- a/libpurple/protocols/null/nullprotocol.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/null/nullprotocol.c	Sun Sep 01 15:57:38 2013 +0530
@@ -101,7 +101,7 @@
  * helpers
  */
 static PurpleConnection *get_null_gc(const char *username) {
-  PurpleAccount *acct = purple_accounts_find(username, NULL_ID);
+  PurpleAccount *acct = purple_accounts_find(username, "null");
   if (acct && purple_account_is_connected(acct))
     return purple_account_get_connection(acct);
   else
@@ -112,7 +112,7 @@
   PurpleConnection *gc = (PurpleConnection *)(data);
   GcFuncData *gcfdata = (GcFuncData *)userdata;
 
-  if (!strcmp(purple_account_get_protocol_id(purple_connection_get_account(gc)), NULL_ID))
+  if (!strcmp(purple_account_get_protocol_id(purple_connection_get_account(gc)), "null"))
     gcfdata->fn(gcfdata->from, gc, gcfdata->userdata);
 }
 
@@ -412,7 +412,7 @@
   const char *from_username = purple_account_get_username(purple_connection_get_account(gc));
   PurpleMessageFlags receive_flags = ((flags & ~PURPLE_MESSAGE_SEND)
                                       | PURPLE_MESSAGE_RECV);
-  PurpleAccount *to_acct = purple_accounts_find(who, NULL_ID);
+  PurpleAccount *to_acct = purple_accounts_find(who, "null");
   PurpleConnection *to;
 
   purple_debug_info("nullprotocol", "sending message from %s to %s: %s\n",
@@ -506,7 +506,7 @@
     g_free(msg);
   }
 
-  acct = purple_accounts_find(username, NULL_ID);
+  acct = purple_accounts_find(username, "null");
   if (acct)
     body = purple_account_get_user_info(acct);
   else
@@ -720,7 +720,7 @@
   const char *username = purple_account_get_username(purple_connection_get_account(gc));
   PurpleChatConversation *chat = purple_conversations_find_chat(gc, id);
   const char *room = purple_conversation_get_name(PURPLE_CONVERSATION(chat));
-  PurpleAccount *to_acct = purple_accounts_find(who, NULL_ID);
+  PurpleAccount *to_acct = purple_accounts_find(who, "null");
 
   purple_debug_info("nullprotocol", "%s is inviting %s to join chat room %s\n",
                     username, who, room);
@@ -1058,8 +1058,8 @@
   PurpleAccountUserSplit *split;
   PurpleAccountOption *option;
 
-  proto_class->id        = NULL_ID;
-  proto_class->name      = NULL_NAME;
+  proto_class->id        = "null";
+  proto_class->name      = "Null - Testing Protocol";
   proto_class->options   = OPT_PROTO_NO_PASSWORD | OPT_PROTO_CHAT_TOPIC;
   proto_class->icon_spec = purple_buddy_icon_spec_new(
       "png,jpg,gif",                   /* format */
@@ -1169,8 +1169,8 @@
 plugin_query(GError **error)
 {
   return purple_plugin_info_new(
-    "id",           NULL_ID,
-    "name",         NULL_NAME,
+    "id",           "protocol-null",
+    "name",         "Null Protocol",
     "version",      DISPLAY_VERSION,
     "category",     N_("Protocol"),
     "summary",      N_("Null Protocol Plugin"),

--- a/libpurple/protocols/null/nullprotocol.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/null/nullprotocol.h	Sun Sep 01 15:57:38 2013 +0530
@@ -24,9 +24,6 @@
 
 #include "protocol.h"
 
-#define NULL_ID     "null"
-#define NULL_NAME   "Null - Testing Plugin"
-
 #define NULL_TYPE_PROTOCOL             (null_protocol_get_type())
 #define NULL_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), NULL_TYPE_PROTOCOL, NullProtocol))
 #define NULL_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), NULL_TYPE_PROTOCOL, NullProtocolClass))

--- a/libpurple/protocols/oscar/libaim.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/oscar/libaim.c	Sun Sep 01 15:57:38 2013 +0530
@@ -39,8 +39,8 @@
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 	PurpleAccountOption *option;
 
-	proto_class->id        = AIM_ID;
-	proto_class->name      = AIM_NAME;
+	proto_class->id        = "aim";
+	proto_class->name      = "AIM";
 
 	option = purple_account_option_string_new(_("Server"), "server", oscar_get_login_server(FALSE, TRUE));
 	proto_class->protocol_options = g_list_append(proto_class->protocol_options, option);
@@ -62,8 +62,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           AIM_ID,
-		"name",         AIM_NAME,
+		"id",           "protocol-aim",
+		"name",         "AIM Protocol",
 		"version",      DISPLAY_VERSION,
 		"category",     N_("Protocol"),
 		"summary",      N_("AIM Protocol Plugin"),

--- a/libpurple/protocols/oscar/libicq.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/oscar/libicq.c	Sun Sep 01 15:57:38 2013 +0530
@@ -55,8 +55,8 @@
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 	PurpleAccountOption *option;
 
-	proto_class->id        = ICQ_ID;
-	proto_class->name      = ICQ_NAME;
+	proto_class->id        = "icq";
+	proto_class->name      = "ICQ";
 
 	option = purple_account_option_string_new(_("Server"), "server", oscar_get_login_server(TRUE, TRUE));
 	proto_class->protocol_options = g_list_append(proto_class->protocol_options, option);
@@ -80,15 +80,15 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",            ICQ_ID,
-		"name",          ICQ_NAME,
+		"id",            "protocol-icq",
+		"name",          "ICQ Protocol",
 		"version",       DISPLAY_VERSION,
 		"category",      N_("Protocol"),
 		"summary",       N_("ICQ Protocol Plugin"),
 		"description",   N_("ICQ Protocol Plugin"),
 		"website",       PURPLE_WEBSITE,
 		"abi-version",   PURPLE_ABI_VERSION,
-		"dependencies",  AIM_ID,
+		"dependencies",  "protocol-aim",
 		"flags",         GPLUGIN_PLUGIN_INFO_FLAGS_INTERNAL |
 		                 GPLUGIN_PLUGIN_INFO_FLAGS_LOAD_ON_QUERY,
 		NULL

--- a/libpurple/protocols/oscar/libicq.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/oscar/libicq.h	Sun Sep 01 15:57:38 2013 +0530
@@ -24,9 +24,6 @@
 
 #include "oscar.h"
 
-#define ICQ_ID     "icq"
-#define ICQ_NAME   "ICQ"
-
 #define ICQ_TYPE_PROTOCOL             (icq_protocol_get_type())
 #define ICQ_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), ICQ_TYPE_PROTOCOL, ICQProtocol))
 #define ICQ_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), ICQ_TYPE_PROTOCOL, ICQProtocolClass))

--- a/libpurple/protocols/oscar/oscar.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/oscar/oscar.h	Sun Sep 01 15:57:38 2013 +0530
@@ -56,9 +56,6 @@
 #include "libc_interface.h"
 #endif
 
-#define AIM_ID     "aim"
-#define AIM_NAME   "AIM"
-
 #define OSCAR_TYPE_PROTOCOL             (oscar_protocol_get_type())
 #define OSCAR_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), OSCAR_TYPE_PROTOCOL, OscarProtocol))
 #define OSCAR_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), OSCAR_TYPE_PROTOCOL, OscarProtocolClass))

--- a/libpurple/protocols/sametime/sametime.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/sametime/sametime.c	Sun Sep 01 15:57:38 2013 +0530
@@ -67,12 +67,16 @@
 
 static PurpleProtocol *my_protocol = NULL;
 
+#define PROTOCOL_ID        "meanwhile"
+#define PROTOCOL_NAME      "Sametime"
+
+
 /* considering that there's no display of this information for protocols,
    I don't know why I even bother providing these. Oh valiant reader,
    I do it all for you. */
 /* scratch that, I just added it to the protocol options panel */
-#define PLUGIN_ID        "meanwhile"
-#define PLUGIN_NAME      "Sametime"
+#define PLUGIN_ID        "protocol-sametime"
+#define PLUGIN_NAME      "Sametime Protocol"
 #define PLUGIN_CATEGORY  "Protocol"
 #define PLUGIN_SUMMARY   "Sametime Protocol Plugin"
 #define PLUGIN_DESC      "Open implementation of a Lotus Sametime client"
@@ -5624,8 +5628,8 @@
   GLogLevelFlags logflags =
     G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION;
 
-  proto_class->id      = PLUGIN_ID;
-  proto_class->name    = PLUGIN_NAME;
+  proto_class->id      = PROTOCOL_ID;
+  proto_class->name    = PROTOCOL_NAME;
   proto_class->options = OPT_PROTO_IM_IMAGE;
 
   /* set up the preferences */
@@ -5739,7 +5743,7 @@
 plugin_query(GError **error)
 {
   return purple_plugin_info_new(
-    "id",           "protocol-" PLUGIN_ID,
+    "id",           PLUGIN_ID,
     "name",         PLUGIN_NAME,
     "version",      DISPLAY_VERSION,
     "category",     PLUGIN_CATEGORY,

--- a/libpurple/protocols/silc/silc.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/silc/silc.c	Sun Sep 01 15:57:38 2013 +0530
@@ -2072,8 +2072,8 @@
 	PurpleKeyValuePair *kvp;
 	GList *list = NULL;
 
-	proto_class->id        = SILCPURPLE_ID;
-	proto_class->name      = SILCPURPLE_NAME;
+	proto_class->id        = "silc";
+	proto_class->name      = "SILC";
 	proto_class->options   = OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME |
 	                         OPT_PROTO_PASSWORD_OPTIONAL | OPT_PROTO_IM_IMAGE |
 	                         OPT_PROTO_SLASH_COMMANDS_NATIVE;
@@ -2081,7 +2081,7 @@
 	                                                 0, 0, 96, 96, 0,
 	                                                 PURPLE_ICON_SCALE_DISPLAY);
 
-	proto_class->whiteboard_protocol_ops = &silcpurple_wb_ops;
+	proto_class->whiteboard_ops = &silcpurple_wb_ops;
 
 	split = purple_account_user_split_new(_("Network"), "silcnet.org", '@');
 	proto_class->user_splits = g_list_append(proto_class->user_splits, split);
@@ -2195,8 +2195,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           SILCPURPLE_ID,
-		"name",         SILCPURPLE_NAME,
+		"id",           "protocol-silc",
+		"name",         "SILC Protocol",
 		"version",      "1.1",
 		"category",     N_("Protocol"),
 		"summary",      N_("SILC Protocol Plugin"),

--- a/libpurple/protocols/silc/silcpurple.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/silc/silcpurple.h	Sun Sep 01 15:57:38 2013 +0530
@@ -38,9 +38,6 @@
 #undef SILC_VERSION
 #define SILC_VERSION(a, b, c) (((a) << 24) + ((b) << 16) + ((c) << 8))
 
-#define SILCPURPLE_ID     "silc"
-#define SILCPURPLE_NAME   "SILC"
-
 #define SILCPURPLE_TYPE_PROTOCOL             (silcpurple_protocol_get_type())
 #define SILCPURPLE_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), SILCPURPLE_TYPE_PROTOCOL, SILCProtocol))
 #define SILCPURPLE_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), SILCPURPLE_TYPE_PROTOCOL, SILCProtocolClass))

--- a/libpurple/protocols/simple/simple.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/simple/simple.c	Sun Sep 01 15:57:38 2013 +0530
@@ -2055,8 +2055,8 @@
 	PurpleAccountUserSplit *split;
 	PurpleAccountOption *option;
 
-	proto_class->id        = SIMPLE_ID;
-	proto_class->name      = SIMPLE_NAME;
+	proto_class->id        = "simple";
+	proto_class->name      = "SIMPLE";
 
 	split = purple_account_user_split_new(_("Server"), "", '@');
 	proto_class->user_splits = g_list_append(proto_class->user_splits, split);
@@ -2101,8 +2101,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           SIMPLE_ID,
-		"name",         SIMPLE_NAME,
+		"id",           "protocol-simple",
+		"name",         "SIMPLE Protocol",
 		"version",		DISPLAY_VERSION,
 		"category",		N_("Protocol"),
 		"summary",		N_("SIP/SIMPLE Protocol Plugin"),

--- a/libpurple/protocols/simple/simple.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/simple/simple.h	Sun Sep 01 15:57:38 2013 +0530
@@ -46,9 +46,6 @@
 #define PUBLISH_EXPIRATION 600
 #define SUBSCRIBE_EXPIRATION 1200
 
-#define SIMPLE_ID     "simple"
-#define SIMPLE_NAME   "SIMPLE"
-
 #define SIMPLE_TYPE_PROTOCOL             (simple_protocol_get_type())
 #define SIMPLE_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), SIMPLE_TYPE_PROTOCOL, SIMPLEProtocol))
 #define SIMPLE_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), SIMPLE_TYPE_PROTOCOL, SIMPLEProtocolClass))

--- a/libpurple/protocols/yahoo/libyahoo.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/yahoo/libyahoo.c	Sun Sep 01 15:57:38 2013 +0530
@@ -193,15 +193,15 @@
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 	PurpleAccountOption *option;
 
-	proto_class->id        = YAHOO_ID;
-	proto_class->name      = YAHOO_NAME;
+	proto_class->id        = "yahoo";
+	proto_class->name      = "Yahoo";
 	proto_class->options   = OPT_PROTO_MAIL_CHECK | OPT_PROTO_CHAT_TOPIC |
 	                         OPT_PROTO_AUTHORIZATION_DENIED_MESSAGE;
 	proto_class->icon_spec = purple_buddy_icon_spec_new("png,gif,jpeg",
 	                                                    96, 96, 96, 96, 0,
 	                                                    PURPLE_ICON_SCALE_SEND);
 
-	proto_class->whiteboard_protocol_ops = &yahoo_whiteboard_ops;
+	proto_class->whiteboard_ops = &yahoo_whiteboard_ops;
 
 	option = purple_account_option_int_new(_("Pager port"), "port", YAHOO_PAGER_PORT);
 	proto_class->protocol_options = g_list_append(proto_class->protocol_options, option);
@@ -287,8 +287,8 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           YAHOO_ID,
-		"name",         YAHOO_NAME,
+		"id",           "protocol-yahoo",
+		"name",         "Yahoo Protocol",
 		"version",      DISPLAY_VERSION,
 		"category",     N_("Protocol"),
 		"summary",      N_("Yahoo! Protocol Plugin"),

--- a/libpurple/protocols/yahoo/libyahoo.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/yahoo/libyahoo.h	Sun Sep 01 15:57:38 2013 +0530
@@ -24,9 +24,6 @@
 
 #include "protocol.h"
 
-#define YAHOO_ID     "yahoo"
-#define YAHOO_NAME   "Yahoo"
-
 #define YAHOO_TYPE_PROTOCOL             (yahoo_protocol_get_type())
 #define YAHOO_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), YAHOO_TYPE_PROTOCOL, YahooProtocol))
 #define YAHOO_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), YAHOO_TYPE_PROTOCOL, YahooProtocolClass))

--- a/libpurple/protocols/yahoo/libyahoojp.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/yahoo/libyahoojp.c	Sun Sep 01 15:57:38 2013 +0530
@@ -73,8 +73,8 @@
 	PurpleProtocolClass *proto_class = PURPLE_PROTOCOL_CLASS(klass);
 	PurpleAccountOption *option;
 
-	proto_class->id        = YAHOOJP_ID;
-	proto_class->name      = YAHOOJP_NAME;
+	proto_class->id        = "yahoojp";
+	proto_class->name      = "Yahoo JAPAN";
 
 	/* delete yahoo's protocol options */
 	while (proto_class->protocol_options) {
@@ -116,15 +116,15 @@
 plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",            YAHOOJP_ID,
-		"name",          YAHOOJP_NAME,
+		"id",            "protocol-yahoojp",
+		"name",          "Yahoo JAPAN Protocol",
 		"version",       DISPLAY_VERSION,
 		"category",      N_("Protocol"),
 		"summary",       N_("Yahoo! JAPAN Protocol Plugin"),
 		"description",   N_("Yahoo! JAPAN Protocol Plugin"),
 		"website",       PURPLE_WEBSITE,
 		"abi-version",   PURPLE_ABI_VERSION,
-		"dependencies",  YAHOO_ID,
+		"dependencies",  "protocol-yahoo",
 		"flags",         GPLUGIN_PLUGIN_INFO_FLAGS_INTERNAL |
 		                 GPLUGIN_PLUGIN_INFO_FLAGS_LOAD_ON_QUERY,
 		NULL

--- a/libpurple/protocols/yahoo/libyahoojp.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/yahoo/libyahoojp.h	Sun Sep 01 15:57:38 2013 +0530
@@ -24,9 +24,6 @@
 
 #include "libyahoo.h"
 
-#define YAHOOJP_ID     "yahoojp"
-#define YAHOOJP_NAME   "Yahoo JAPAN"
-
 #define YAHOOJP_TYPE_PROTOCOL             (yahoojp_protocol_get_type())
 #define YAHOOJP_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), YAHOOJP_TYPE_PROTOCOL, YahooJPProtocol))
 #define YAHOOJP_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), YAHOOJP_TYPE_PROTOCOL, YahooJPProtocolClass))

--- a/libpurple/protocols/zephyr/zephyr.c	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/zephyr/zephyr.c	Sun Sep 01 15:57:38 2013 +0530
@@ -2873,8 +2873,8 @@
 	PurpleAccountOption *option;
 	char *tmp = get_exposure_level();
 
-	proto_class->id      = ZEPHYR_ID;
-	proto_class->name    = ZEPHYR_NAME;
+	proto_class->id      = "zephyr";
+	proto_class->name    = "Zephyr";
 	proto_class->options = OPT_PROTO_CHAT_TOPIC | OPT_PROTO_NO_PASSWORD;
 
 	option = purple_account_option_bool_new(_("Use tzc"), "use_tzc", FALSE);
@@ -2942,8 +2942,8 @@
 static PurplePluginInfo *plugin_query(GError **error)
 {
 	return purple_plugin_info_new(
-		"id",           ZEPHYR_ID,
-		"name",         ZEPHYR_NAME,
+		"id",           "protocol-zephyr",
+		"name",         "Zephyr Protocol",
 		"version",      DISPLAY_VERSION,
 		"category",     N_("Protocol"),
 		"summary",      N_("Zephyr Protocol Plugin"),

--- a/libpurple/protocols/zephyr/zephyr.h	Sun Sep 01 14:24:24 2013 +0530
+++ b/libpurple/protocols/zephyr/zephyr.h	Sun Sep 01 15:57:38 2013 +0530
@@ -24,9 +24,6 @@
 
 #include "protocol.h"
 
-#define ZEPHYR_ID     "zephyr"
-#define ZEPHYR_NAME   "Zephyr"
-
 #define ZEPHYR_TYPE_PROTOCOL             (zephyr_protocol_get_type())
 #define ZEPHYR_PROTOCOL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), ZEPHYR_TYPE_PROTOCOL, ZephyrProtocol))
 #define ZEPHYR_PROTOCOL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), ZEPHYR_TYPE_PROTOCOL, ZephyrProtocolClass))