# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1257373011 0
# Node ID bb923bcae9de3e6fddb332ab514b5b0ca0d05408
# Parent  86ff30fb8ae31834103c7a492268c4814c58ea49# Parent  a990da4540d35c26d69bd2d07dba557cd093d3d6
merge of '661db628ce40c3548058f062ea72d9687654d53a'
     and '8a71ac6c6bfac72c7077754c4d8178b77f14b18f'

diff -r 86ff30fb8ae3 -r bb923bcae9de libpurple/protocols/oscar/libaim.c
--- a/libpurple/protocols/oscar/libaim.c	Wed Nov 04 22:16:46 2009 +0000
+++ b/libpurple/protocols/oscar/libaim.c	Wed Nov 04 22:16:51 2009 +0000
@@ -141,7 +141,7 @@
 static void
 init_plugin(PurplePlugin *plugin)
 {
-	oscar_init(PURPLE_PLUGIN_PROTOCOL_INFO(plugin));
+	oscar_init(plugin);
 }
 
 PURPLE_INIT_PLUGIN(aim, init_plugin, info);
diff -r 86ff30fb8ae3 -r bb923bcae9de libpurple/protocols/oscar/libicq.c
--- a/libpurple/protocols/oscar/libicq.c	Wed Nov 04 22:16:46 2009 +0000
+++ b/libpurple/protocols/oscar/libicq.c	Wed Nov 04 22:16:51 2009 +0000
@@ -153,7 +153,7 @@
 {
 	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);
diff -r 86ff30fb8ae3 -r bb923bcae9de libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Wed Nov 04 22:16:46 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed Nov 04 22:16:51 2009 +0000
@@ -7112,8 +7112,9 @@
 	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;
 
@@ -7136,9 +7137,11 @@
 		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;
diff -r 86ff30fb8ae3 -r bb923bcae9de libpurple/protocols/oscar/oscarcommon.h
--- a/libpurple/protocols/oscar/oscarcommon.h	Wed Nov 04 22:16:46 2009 +0000
+++ b/libpurple/protocols/oscar/oscarcommon.h	Wed Nov 04 22:16:51 2009 +0000
@@ -94,4 +94,4 @@
 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);