pidgin: 8a71ac6c: oscar: Remove the simultaneous logins op...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 8a71ac6c6bfac72c7077754c4d8178b77f14b18f
Ancestor: 7b531a1a6399a190c10642d470a45c406cb62374
Author: darkrain42 at pidgin.im
Date: 2009-11-04T19:05:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8a71ac6c6bfac72c7077754c4d8178b77f14b18f

Modified files:
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscarcommon.h

ChangeLog: 

oscar: Remove the simultaneous logins option from ICQ accounts.

Marcus pointed out that it's only useful for AIM.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/libaim.c	0b2fdf644a5cdacfd8eb654a22e2c0306a9dcd78
+++ libpurple/protocols/oscar/libaim.c	44607aafaebb1881d3f9b8185387788fc9a5ab32
@@ -141,7 +141,7 @@ init_plugin(PurplePlugin *plugin)
 static void
 init_plugin(PurplePlugin *plugin)
 {
-	oscar_init(PURPLE_PLUGIN_PROTOCOL_INFO(plugin));
+	oscar_init(plugin);
 }
 
 PURPLE_INIT_PLUGIN(aim, init_plugin, info);
============================================================
--- libpurple/protocols/oscar/libicq.c	e85c0d573140cb77cd6e94c9c497f10d406ce5b4
+++ libpurple/protocols/oscar/libicq.c	86d7efbb20bc09f5a0ac37cfcfa17b8cdd6a52cb
@@ -153,7 +153,7 @@ init_plugin(PurplePlugin *plugin)
 {
 	PurpleAccountOption *option;
 
-	oscar_init(PURPLE_PLUGIN_PROTOCOL_INFO(plugin));
+	oscar_init(plugin);
 
 	option = purple_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
============================================================
--- libpurple/protocols/oscar/oscar.c	74e9ab37a96ec209cbe34457b99295a02cd5fd78
+++ libpurple/protocols/oscar/oscar.c	5fbc520305b5e241e335fa639730afb7dd9462b3
@@ -7159,8 +7159,9 @@ static gboolean oscar_uri_handler(const 
 	return FALSE;
 }
 
-void oscar_init(PurplePluginProtocolInfo *prpl_info)
+void oscar_init(PurplePlugin *plugin)
 {
+	PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 	PurpleAccountOption *option;
 	static gboolean init = FALSE;
 
@@ -7183,9 +7184,11 @@ void oscar_init(PurplePluginProtocolInfo
 		OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY);
 	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
 
-	option = purple_account_option_bool_new(_("Allow multiple simultaneous logins"), "allow_multiple_logins",
-											OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS);
-	prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
+	if (g_str_equal(purple_plugin_get_id(plugin), "prpl-aim")) {
+		option = purple_account_option_bool_new(_("Allow multiple simultaneous logins"), "allow_multiple_logins",
+												OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS);
+		prpl_info->protocol_options = g_list_append(prpl_info->protocol_options, option);
+	}
 
 	if (init)
 		return;
============================================================
--- libpurple/protocols/oscar/oscarcommon.h	e23a6e68cad3d8000065cb467aba60b50e60aedf
+++ libpurple/protocols/oscar/oscarcommon.h	f3a16312b92c3f6acb9e422fc326df1bbadf2c32
@@ -94,4 +94,4 @@ GList *oscar_actions(PurplePlugin *plugi
 gboolean oscar_offline_message(const PurpleBuddy *buddy);
 void oscar_format_username(PurpleConnection *gc, const char *nick);
 GList *oscar_actions(PurplePlugin *plugin, gpointer context);
-void oscar_init(PurplePluginProtocolInfo *prpl_info);
+void oscar_init(PurplePlugin *plugin);