changeset 14968:ad564b48dab0

[gaim-migrate @ 17747] AIM and ICQ are now different prpls, linked against a liboscarcommon which contains the protocol implementation committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Tue, 14 Nov 2006 04:04:04 +0000
parents 9bfc30adbda2
children 43f692951d49
files libgaim/account.c libgaim/protocols/oscar/Makefile.am libgaim/protocols/oscar/libaim.c libgaim/protocols/oscar/libicq.c libgaim/protocols/oscar/oscar.c libgaim/protocols/oscar/oscarcommon.h
diffstat 6 files changed, 473 insertions(+), 172 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/account.c	Mon Nov 13 20:10:29 2006 +0000
+++ b/libgaim/account.c	Tue Nov 14 04:04:04 2006 +0000
@@ -702,6 +702,19 @@
 		return NULL;
 	}
 
+
+	/* HACK BY SEANEGAN: special case prpl-oscar to either prpl-icq
+	 * prpl-aim for users upgrading to 2.0.0. This can probably
+	 * be removed after a while
+	 */
+	if (!strcmp(protocol_id, "prpl-oscar")) {
+		g_free(protocol_id);
+		if (isdigit(name[0]))
+			protocol_id = g_strdup("prpl-icq");
+		else 
+			protocol_id = g_strdup("prpl-aim");
+	}
+
 	ret = gaim_account_new(name, protocol_id);
 	g_free(name);
 	g_free(protocol_id);
--- a/libgaim/protocols/oscar/Makefile.am	Mon Nov 13 20:10:29 2006 +0000
+++ b/libgaim/protocols/oscar/Makefile.am	Tue Nov 14 04:04:04 2006 +0000
@@ -46,22 +46,34 @@
 
 AM_CFLAGS = $(st)
 
-liboscar_la_LDFLAGS = -module -avoid-version
-
+libaim_la_LDFLAGS = -module -avoid-version
+libicq_la_LDFLAGS = -module -avoid-version
 if STATIC_OSCAR
 
 st = -DGAIM_STATIC_PRPL
-noinst_LIBRARIES   = liboscar.a
+noinst_LIBRARIES   = liboscar.a libaim.a libicq.a
 liboscar_a_SOURCES = $(OSCARSOURCES)
 liboscar_a_CFLAGS  = $(AM_CFLAGS)
 
+libaim_a_CFLAGS = $(AM_CFLAGS)
+libaim_a_SOURCES = libaim.c
+
+libicq_a_CFLAGS = $(AM_CFLAGS)
+libicq_a_SOURCES = libicq.c
+
 else
 
 st =
-pkg_LTLIBRARIES     = liboscar.la
+pkg_LTLIBRARIES     = liboscar.la libaim.la libicq.la
 liboscar_la_SOURCES = $(OSCARSOURCES)
 liboscar_la_LIBADD  = $(GLIB_LIBS)
 
+libaim_la_SOURCES = libaim.c
+libaim_la_LIBADD = liboscar.la
+
+libicq_la_SOURCES = libicq.c
+libicq_la_LIBADD = liboscar.la
+
 endif
 
 AM_CPPFLAGS = \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libgaim/protocols/oscar/libaim.c	Tue Nov 14 04:04:04 2006 +0000
@@ -0,0 +1,149 @@
+/* gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+/* libaim is the AIM protocol plugin. It is linked against liboscarcommon,
+ * which contains all the shared implementation code with libicq
+ */
+
+#include "oscarcommon.h"
+
+static GaimPluginProtocolInfo prpl_info =
+{
+	OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
+	NULL,					/* user_splits */
+	NULL,					/* protocol_options */
+	{"gif,jpeg,bmp,ico", 48, 48, 50, 50,
+		GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY},	/* icon_spec */
+	oscar_list_icon_aim,		/* list_icon */
+	oscar_list_emblems,		/* list_emblems */
+	oscar_status_text,		/* status_text */
+	oscar_tooltip_text,		/* tooltip_text */
+	oscar_status_types,		/* status_types */
+	oscar_blist_node_menu,	/* blist_node_menu */
+	oscar_chat_info,		/* chat_info */
+	oscar_chat_info_defaults, /* chat_info_defaults */
+	oscar_login,			/* login */
+	oscar_close,			/* close */
+	oscar_send_im,			/* send_im */
+	oscar_set_info,			/* set_info */
+	oscar_send_typing,		/* send_typing */
+	oscar_get_info,			/* get_info */
+	oscar_set_status,		/* set_status */
+	oscar_set_idle,			/* set_idle */
+	oscar_change_passwd,	/* change_passwd */
+	oscar_add_buddy,		/* add_buddy */
+	NULL,					/* add_buddies */
+	oscar_remove_buddy,		/* remove_buddy */
+	NULL,					/* remove_buddies */
+	oscar_add_permit,		/* add_permit */
+	oscar_add_deny,			/* add_deny */
+	oscar_rem_permit,		/* rem_permit */
+	oscar_rem_deny,			/* rem_deny */
+	oscar_set_permit_deny,	/* set_permit_deny */
+	oscar_join_chat,		/* join_chat */
+	NULL,					/* reject_chat */
+	oscar_get_chat_name,	/* get_chat_name */
+	oscar_chat_invite,		/* chat_invite */
+	oscar_chat_leave,		/* chat_leave */
+	NULL,					/* chat_whisper */
+	oscar_send_chat,		/* chat_send */
+	oscar_keepalive,		/* keepalive */
+	NULL,					/* register_user */
+	NULL,					/* get_cb_info */
+	NULL,					/* get_cb_away */
+	oscar_alias_buddy,		/* alias_buddy */
+	oscar_move_buddy,		/* group_buddy */
+	oscar_rename_group,		/* rename_group */
+	NULL,					/* buddy_free */
+	oscar_convo_closed,		/* convo_closed */
+	oscar_normalize,		/* normalize */
+	oscar_set_icon,			/* set_buddy_icon */
+	NULL,					/* remove_group */
+	NULL,					/* get_cb_real_name */
+	NULL,					/* set_chat_topic */
+	NULL,					/* find_blist_chat */
+	NULL,					/* roomlist_get_list */
+	NULL,					/* roomlist_cancel */
+	NULL,					/* roomlist_expand_category */
+	oscar_can_receive_file,	/* can_receive_file */
+	oscar_send_file,		/* send_file */
+	oscar_new_xfer,			/* new_xfer */
+	oscar_offline_message,	/* offline_message */
+	NULL,					/* whiteboard_prpl_ops */
+	NULL,				/* send_raw */
+};
+
+static GaimPluginInfo info =
+{
+	GAIM_PLUGIN_MAGIC,
+	GAIM_MAJOR_VERSION,
+	GAIM_MINOR_VERSION,
+	GAIM_PLUGIN_PROTOCOL,                             /**< type           */
+	NULL,                                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
+
+	"prpl-aim",                                       /**< id             */
+	"AIM",                                            /**< name           */
+	VERSION,                                          /**< version        */
+	                                                  /**  summary        */
+	N_("AIM Protocol Plugin"),
+	                                                  /**  description    */
+	N_("AIM Protocol Plugin"),
+	NULL,                                             /**< author         */
+	GAIM_WEBSITE,                                     /**< homepage       */
+
+	NULL,                                             /**< load           */
+	NULL,                                             /**< unload         */
+	NULL,                                             /**< destroy        */
+
+	NULL,                                             /**< ui_info        */
+	&prpl_info,                                       /**< extra_info     */
+	NULL,
+	oscar_actions
+};
+
+static void
+init_plugin(GaimPlugin *plugin)
+{
+	GaimAccountOption *option;
+
+	option = gaim_account_option_string_new(_("Server"), "server", OSCAR_DEFAULT_LOGIN_SERVER);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = gaim_account_option_int_new(_("Port"), "port", OSCAR_DEFAULT_LOGIN_PORT);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = gaim_account_option_bool_new(
+		_("Always use AIM/ICQ proxy server for file transfers\n(slower, but does not reveal your IP address)"), "always_use_rv_proxy",
+		OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	/* Preferences */
+	gaim_prefs_add_none("/plugins/prpl/oscar");
+	gaim_prefs_add_bool("/plugins/prpl/oscar/recent_buddies", FALSE);
+	gaim_prefs_add_bool("/plugins/prpl/oscar/show_idle", FALSE);
+	gaim_prefs_remove("/plugins/prpl/oscar/always_use_rv_proxy");
+}
+
+GAIM_INIT_PLUGIN(oscar, init_plugin, info);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libgaim/protocols/oscar/libicq.c	Tue Nov 14 04:04:04 2006 +0000
@@ -0,0 +1,153 @@
+/* gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+/* libicq is the ICQ protocol plugin. It is linked against liboscarcommon,
+ * which contains all the shared implementation code with libaim
+ */
+
+
+#include "oscarcommon.h"
+
+static GaimPluginProtocolInfo prpl_info =
+{
+	OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
+	NULL,					/* user_splits */
+	NULL,					/* protocol_options */
+	{"gif,jpeg,bmp,ico", 48, 48, 50, 50,
+		GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY},	/* icon_spec */
+	oscar_list_icon_icq,		/* list_icon */
+	oscar_list_emblems,		/* list_emblems */
+	oscar_status_text,		/* status_text */
+	oscar_tooltip_text,		/* tooltip_text */
+	oscar_status_types,		/* status_types */
+	oscar_blist_node_menu,	/* blist_node_menu */
+	oscar_chat_info,		/* chat_info */
+	oscar_chat_info_defaults, /* chat_info_defaults */
+	oscar_login,			/* login */
+	oscar_close,			/* close */
+	oscar_send_im,			/* send_im */
+	oscar_set_info,			/* set_info */
+	oscar_send_typing,		/* send_typing */
+	oscar_get_info,			/* get_info */
+	oscar_set_status,		/* set_status */
+	oscar_set_idle,			/* set_idle */
+	oscar_change_passwd,	/* change_passwd */
+	oscar_add_buddy,		/* add_buddy */
+	NULL,					/* add_buddies */
+	oscar_remove_buddy,		/* remove_buddy */
+	NULL,					/* remove_buddies */
+	oscar_add_permit,		/* add_permit */
+	oscar_add_deny,			/* add_deny */
+	oscar_rem_permit,		/* rem_permit */
+	oscar_rem_deny,			/* rem_deny */
+	oscar_set_permit_deny,	/* set_permit_deny */
+	oscar_join_chat,		/* join_chat */
+	NULL,					/* reject_chat */
+	oscar_get_chat_name,	/* get_chat_name */
+	oscar_chat_invite,		/* chat_invite */
+	oscar_chat_leave,		/* chat_leave */
+	NULL,					/* chat_whisper */
+	oscar_send_chat,		/* chat_send */
+	oscar_keepalive,		/* keepalive */
+	NULL,					/* register_user */
+	NULL,					/* get_cb_info */
+	NULL,					/* get_cb_away */
+	oscar_alias_buddy,		/* alias_buddy */
+	oscar_move_buddy,		/* group_buddy */
+	oscar_rename_group,		/* rename_group */
+	NULL,					/* buddy_free */
+	oscar_convo_closed,		/* convo_closed */
+	oscar_normalize,		/* normalize */
+	oscar_set_icon,			/* set_buddy_icon */
+	NULL,					/* remove_group */
+	NULL,					/* get_cb_real_name */
+	NULL,					/* set_chat_topic */
+	NULL,					/* find_blist_chat */
+	NULL,					/* roomlist_get_list */
+	NULL,					/* roomlist_cancel */
+	NULL,					/* roomlist_expand_category */
+	oscar_can_receive_file,	/* can_receive_file */
+	oscar_send_file,		/* send_file */
+	oscar_new_xfer,			/* new_xfer */
+	oscar_offline_message,	/* offline_message */
+	NULL,					/* whiteboard_prpl_ops */
+	NULL,				/* send_raw */
+};
+
+static GaimPluginInfo info =
+{
+	GAIM_PLUGIN_MAGIC,
+	GAIM_MAJOR_VERSION,
+	GAIM_MINOR_VERSION,
+	GAIM_PLUGIN_PROTOCOL,                             /**< type           */
+	NULL,                                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
+
+	"prpl-icq",                                     /**< id             */
+	"ICQ",                                        /**< name           */
+	VERSION,                                          /**< version        */
+	                                                  /**  summary        */
+	N_("ICQ Protocol Plugin"),
+	                                                  /**  description    */
+	N_("ICQ Protocol Plugin"),
+	NULL,                                             /**< author         */
+	GAIM_WEBSITE,                                     /**< homepage       */
+
+	NULL,                                             /**< load           */
+	NULL,                                             /**< unload         */
+	NULL,                                             /**< destroy        */
+
+	NULL,                                             /**< ui_info        */
+	&prpl_info,                                       /**< extra_info     */
+	NULL,
+	oscar_actions
+};
+
+static void
+init_plugin(GaimPlugin *plugin)
+{
+	GaimAccountOption *option;
+
+	option = gaim_account_option_string_new(_("Server"), "server", OSCAR_DEFAULT_LOGIN_SERVER);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = gaim_account_option_int_new(_("Port"), "port", OSCAR_DEFAULT_LOGIN_PORT);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = gaim_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	option = gaim_account_option_bool_new(
+		_("Always use ICQ proxy server for file transfers\n(slower, but does not reveal your IP address)"), "always_use_rv_proxy",
+		OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+
+	/* Preferences */
+	gaim_prefs_add_none("/plugins/prpl/oscar");
+	gaim_prefs_add_bool("/plugins/prpl/oscar/recent_buddies", FALSE);
+	gaim_prefs_add_bool("/plugins/prpl/oscar/show_idle", FALSE);
+	gaim_prefs_remove("/plugins/prpl/oscar/always_use_rv_proxy");
+}
+
+GAIM_INIT_PLUGIN(oscar, init_plugin, info);
--- a/libgaim/protocols/oscar/oscar.c	Mon Nov 13 20:10:29 2006 +0000
+++ b/libgaim/protocols/oscar/oscar.c	Tue Nov 14 04:04:04 2006 +0000
@@ -25,6 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+
 #include "internal.h"
 
 #include "account.h"
@@ -44,6 +45,7 @@
 #include "util.h"
 #include "version.h"
 
+#include "oscarcommon.h"
 #include "oscar.h"
 #include "peer.h"
 
@@ -202,7 +204,7 @@
 static gboolean gaim_icon_timerfunc(gpointer data);
 
 static void recent_buddies_cb(const char *name, GaimPrefType type, gconstpointer value, gpointer data);
-static void oscar_set_info(GaimConnection *gc, const char *info);
+void oscar_set_info(GaimConnection *gc, const char *info);
 static void oscar_set_info_and_status(GaimAccount *account, gboolean setinfo, const char *rawinfo, gboolean setstatus, GaimStatus *status);
 static void oscar_set_extendedstatus(GaimConnection *gc);
 static gboolean gaim_ssi_rerequestdata(gpointer data);
@@ -1117,7 +1119,7 @@
 	return 1;
 }
 
-static void
+void
 oscar_login(GaimAccount *account)
 {
 	GaimConnection *gc;
@@ -1225,7 +1227,7 @@
 	ck[0] = 0x5a;
 }
 
-static void
+void
 oscar_close(GaimConnection *gc)
 {
 	OscarData *od;
@@ -3930,7 +3932,7 @@
 	return 1;
 }
 
-static void
+void
 oscar_keepalive(GaimConnection *gc)
 {
 	OscarData *od;
@@ -3942,7 +3944,7 @@
 		flap_connection_send_keepalive(od, conn);
 }
 
-static unsigned int
+unsigned int
 oscar_send_typing(GaimConnection *gc, const char *name, GaimTypingState state)
 {
 	OscarData *od;
@@ -4060,7 +4062,7 @@
 	g_string_free(msg, TRUE);
 }
 
-static int
+int
 oscar_send_im(GaimConnection *gc, const char *name, const char *message, GaimMessageFlags imflags)
 {
 	OscarData *od;
@@ -4221,7 +4223,7 @@
  * everyone, and can request ICQ info from ICQ users, and
  * AIM users can only request AIM info.
  */
-static void oscar_get_info(GaimConnection *gc, const char *name) {
+void oscar_get_info(GaimConnection *gc, const char *name) {
 	OscarData *od = (OscarData *)gc->proto_data;
 
 	if (od->icq && aim_sn_is_icq(name))
@@ -4240,7 +4242,7 @@
 }
 #endif
 
-static void oscar_set_idle(GaimConnection *gc, int time) {
+void oscar_set_idle(GaimConnection *gc, int time) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	aim_srv_setidle(od, time);
 }
@@ -4267,7 +4269,7 @@
 	return encoded;
 }
 
-static void
+void
 oscar_set_info(GaimConnection *gc, const char *rawinfo)
 {
 	GaimAccount *account;
@@ -4453,7 +4455,7 @@
 	oscar_set_extendedstatus(gc);
 }
 
-static void
+void
 oscar_set_status(GaimAccount *account, GaimStatus *status)
 {
 	gaim_debug_info("oscar", "Set status to %s\n", gaim_status_get_name(status));
@@ -4473,14 +4475,14 @@
 }
 
 #ifdef CRAZY_WARN
-static void
+void
 oscar_warn(GaimConnection *gc, const char *name, gboolean anonymous) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	aim_im_warn(od, od->conn, name, anonymous ? AIM_WARN_ANON : 0);
 }
 #endif
 
-static void
+void
 oscar_add_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group) {
 	OscarData *od = (OscarData *)gc->proto_data;
 
@@ -4508,7 +4510,7 @@
 		aim_icq_getalias(od, buddy->name);
 }
 
-static void oscar_remove_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group) {
+void oscar_remove_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group) {
 	OscarData *od = (OscarData *)gc->proto_data;
 
 	if (od->ssi.received_data) {
@@ -4518,7 +4520,7 @@
 	}
 }
 
-static void oscar_move_buddy(GaimConnection *gc, const char *name, const char *old_group, const char *new_group) {
+void oscar_move_buddy(GaimConnection *gc, const char *name, const char *old_group, const char *new_group) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	if (od->ssi.received_data && strcmp(old_group, new_group)) {
 		gaim_debug_info("oscar",
@@ -4527,7 +4529,7 @@
 	}
 }
 
-static void oscar_alias_buddy(GaimConnection *gc, const char *name, const char *alias) {
+void oscar_alias_buddy(GaimConnection *gc, const char *name, const char *alias) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	if (od->ssi.received_data) {
 		char *gname = aim_ssi_itemlist_findparentname(od->ssi.local, name);
@@ -4542,7 +4544,7 @@
 /*
  * FYI, the OSCAR SSI code removes empty groups automatically.
  */
-static void oscar_rename_group(GaimConnection *gc, const char *old_name, GaimGroup *group, GList *moved_buddies) {
+void oscar_rename_group(GaimConnection *gc, const char *old_name, GaimGroup *group, GList *moved_buddies) {
 	OscarData *od = (OscarData *)gc->proto_data;
 
 	if (od->ssi.received_data) {
@@ -5131,7 +5133,7 @@
 	return 1;
 }
 
-static GList *oscar_chat_info(GaimConnection *gc) {
+GList *oscar_chat_info(GaimConnection *gc) {
 	GList *m = NULL;
 	struct proto_chat_entry *pce;
 
@@ -5153,7 +5155,7 @@
 	return m;
 }
 
-static GHashTable *oscar_chat_info_defaults(GaimConnection *gc, const char *chat_name)
+GHashTable *oscar_chat_info_defaults(GaimConnection *gc, const char *chat_name)
 {
 	GHashTable *defaults;
 
@@ -5165,13 +5167,13 @@
 	return defaults;
 }
 
-static char *
+char *
 oscar_get_chat_name(GHashTable *data)
 {
 	return g_strdup(g_hash_table_lookup(data, "room"));
 }
 
-static void
+void
 oscar_join_chat(GaimConnection *gc, GHashTable *data)
 {
 	OscarData *od = (OscarData *)gc->proto_data;
@@ -5203,7 +5205,7 @@
 	}
 }
 
-static void
+void
 oscar_chat_invite(GaimConnection *gc, int id, const char *message, const char *name)
 {
 	OscarData *od = (OscarData *)gc->proto_data;
@@ -5216,7 +5218,7 @@
 			ccon->exchange, ccon->name, 0x0);
 }
 
-static void
+void
 oscar_chat_leave(GaimConnection *gc, int id)
 {
 	GaimConversation *conv;
@@ -5232,7 +5234,7 @@
 	oscar_chat_kill(gc, cc);
 }
 
-static int oscar_send_chat(GaimConnection *gc, int id, const char *message, GaimMessageFlags flags) {
+int oscar_send_chat(GaimConnection *gc, int id, const char *message, GaimMessageFlags flags) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	GaimConversation *conv = NULL;
 	struct chat_connection *c = NULL;
@@ -5278,7 +5280,22 @@
 	return 0;
 }
 
-static const char *oscar_list_icon(GaimAccount *a, GaimBuddy *b)
+const char *oscar_list_icon_icq(GaimAccount *a, GaimBuddy *b)
+{
+	if ((b == NULL) || (b->name == NULL) || aim_sn_is_sms(b->name))
+	{
+		if (a == NULL || aim_sn_is_icq(gaim_account_get_username(a)))
+			return "icq";
+		else
+			return "aim";
+	}
+
+	if (aim_sn_is_icq(b->name))
+		return "icq";
+	return "aim";
+}
+
+const char *oscar_list_icon_aim(GaimAccount *a, GaimBuddy *b)
 {
 	if ((b == NULL) || (b->name == NULL) || aim_sn_is_sms(b->name))
 	{
@@ -5293,7 +5310,7 @@
 	return "aim";
 }
 
-static void oscar_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne)
+void oscar_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne)
 {
 	GaimConnection *gc = NULL;
 	OscarData *od = NULL;
@@ -5370,7 +5387,7 @@
 	*ne = emblems[3];
 }
 
-static void oscar_tooltip_text(GaimBuddy *b, GString *str, gboolean full) {
+void oscar_tooltip_text(GaimBuddy *b, GString *str, gboolean full) {
 	GaimConnection *gc = b->account->gc;
 	OscarData *od = gc->proto_data;
 	aim_userinfo_t *userinfo = aim_locate_finduserinfo(od, b->name);
@@ -5420,7 +5437,7 @@
 	}
 }
 
-static char *oscar_status_text(GaimBuddy *b)
+char *oscar_status_text(GaimBuddy *b)
 {
 	GaimConnection *gc;
 	GaimAccount *account;
@@ -5549,7 +5566,7 @@
 	return 0;
 }
 
-static void oscar_set_permit_deny(GaimConnection *gc) {
+void oscar_set_permit_deny(GaimConnection *gc) {
 	GaimAccount *account = gaim_connection_get_account(gc);
 	OscarData *od = (OscarData *)gc->proto_data;
 
@@ -5577,35 +5594,35 @@
 	}
 }
 
-static void oscar_add_permit(GaimConnection *gc, const char *who) {
+void oscar_add_permit(GaimConnection *gc, const char *who) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	gaim_debug_info("oscar", "ssi: About to add a permit\n");
 	if (od->ssi.received_data)
 		aim_ssi_addpermit(od, who);
 }
 
-static void oscar_add_deny(GaimConnection *gc, const char *who) {
+void oscar_add_deny(GaimConnection *gc, const char *who) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	gaim_debug_info("oscar", "ssi: About to add a deny\n");
 	if (od->ssi.received_data)
 		aim_ssi_adddeny(od, who);
 }
 
-static void oscar_rem_permit(GaimConnection *gc, const char *who) {
+void oscar_rem_permit(GaimConnection *gc, const char *who) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	gaim_debug_info("oscar", "ssi: About to delete a permit\n");
 	if (od->ssi.received_data)
 		aim_ssi_delpermit(od, who);
 }
 
-static void oscar_rem_deny(GaimConnection *gc, const char *who) {
+void oscar_rem_deny(GaimConnection *gc, const char *who) {
 	OscarData *od = (OscarData *)gc->proto_data;
 	gaim_debug_info("oscar", "ssi: About to delete a deny\n");
 	if (od->ssi.received_data)
 		aim_ssi_deldeny(od, who);
 }
 
-static GList *
+GList *
 oscar_status_types(GaimAccount *account)
 {
 	gboolean is_icq;
@@ -5801,7 +5818,7 @@
 	aim_locate_getinfoshort(gc->proto_data, gaim_buddy_get_name(buddy), 0x00000003);
 }
 
-static GList *oscar_buddy_menu(GaimBuddy *buddy) {
+GList *oscar_buddy_menu(GaimBuddy *buddy) {
 
 	GaimConnection *gc;
 	OscarData *od;
@@ -5878,7 +5895,7 @@
 }
 
 
-static GList *oscar_blist_node_menu(GaimBlistNode *node) {
+GList *oscar_blist_node_menu(GaimBlistNode *node) {
 	if(GAIM_BLIST_NODE_IS_BUDDY(node)) {
 		return oscar_buddy_menu((GaimBuddy *) node);
 	} else {
@@ -6121,7 +6138,7 @@
 	gaim_notify_uri(gc, "http://mymobile.aol.com/dbreg/register?action=imf&clientID=1");
 }
 
-static void oscar_set_icon(GaimConnection *gc, const char *iconfile)
+void oscar_set_icon(GaimConnection *gc, const char *iconfile)
 {
 	OscarData *od = gc->proto_data;
 	FILE *file;
@@ -6162,7 +6179,7 @@
  * Called by the Gaim core to determine whether or not we're
  * allowed to send a file to this user.
  */
-static gboolean
+gboolean
 oscar_can_receive_file(GaimConnection *gc, const char *who)
 {
 	OscarData *od;
@@ -6191,7 +6208,7 @@
 	return FALSE;
 }
 
-static GaimXfer *
+GaimXfer *
 oscar_new_xfer(GaimConnection *gc, const char *who)
 {
 	GaimXfer *xfer;
@@ -6223,7 +6240,7 @@
  * Called by the Gaim core when the user indicates that a
  * file is to be sent to a special someone.
  */
-static void
+void
 oscar_send_file(GaimConnection *gc, const char *who, const char *file)
 {
 	GaimXfer *xfer;
@@ -6236,7 +6253,7 @@
 		gaim_xfer_request(xfer);
 }
 
-static GList *
+GList *
 oscar_actions(GaimPlugin *plugin, gpointer context)
 {
 	GaimConnection *gc = (GaimConnection *) context;
@@ -6322,7 +6339,7 @@
 	return menu;
 }
 
-static void oscar_change_passwd(GaimConnection *gc, const char *old, const char *new)
+void oscar_change_passwd(GaimConnection *gc, const char *old, const char *new)
 {
 	OscarData *od = gc->proto_data;
 
@@ -6342,7 +6359,7 @@
 	}
 }
 
-static void
+void
 oscar_convo_closed(GaimConnection *gc, const char *who)
 {
 	OscarData *od;
@@ -6387,7 +6404,7 @@
 	gaim_plugin_pref_frame_add(frame, ppref);
 #endif
 
-static const char *
+const char *
 oscar_normalize(const GaimAccount *account, const char *str)
 {
 	static char buf[BUF_LEN];
@@ -6414,7 +6431,7 @@
 	return buf;
 }
 
-static gboolean
+gboolean
 oscar_offline_message(const GaimBuddy *buddy)
 {
 	OscarData *od;
@@ -6428,127 +6445,3 @@
 	return (od->icq && aim_sn_is_icq(gaim_account_get_username(account)));
 }
 
-static GaimPluginProtocolInfo prpl_info =
-{
-	OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE,
-	NULL,					/* user_splits */
-	NULL,					/* protocol_options */
-	{"gif,jpeg,bmp,ico", 48, 48, 50, 50,
-		GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY},	/* icon_spec */
-	oscar_list_icon,		/* list_icon */
-	oscar_list_emblems,		/* list_emblems */
-	oscar_status_text,		/* status_text */
-	oscar_tooltip_text,		/* tooltip_text */
-	oscar_status_types,		/* status_types */
-	oscar_blist_node_menu,	/* blist_node_menu */
-	oscar_chat_info,		/* chat_info */
-	oscar_chat_info_defaults, /* chat_info_defaults */
-	oscar_login,			/* login */
-	oscar_close,			/* close */
-	oscar_send_im,			/* send_im */
-	oscar_set_info,			/* set_info */
-	oscar_send_typing,		/* send_typing */
-	oscar_get_info,			/* get_info */
-	oscar_set_status,		/* set_status */
-	oscar_set_idle,			/* set_idle */
-	oscar_change_passwd,	/* change_passwd */
-	oscar_add_buddy,		/* add_buddy */
-	NULL,					/* add_buddies */
-	oscar_remove_buddy,		/* remove_buddy */
-	NULL,					/* remove_buddies */
-	oscar_add_permit,		/* add_permit */
-	oscar_add_deny,			/* add_deny */
-	oscar_rem_permit,		/* rem_permit */
-	oscar_rem_deny,			/* rem_deny */
-	oscar_set_permit_deny,	/* set_permit_deny */
-	oscar_join_chat,		/* join_chat */
-	NULL,					/* reject_chat */
-	oscar_get_chat_name,	/* get_chat_name */
-	oscar_chat_invite,		/* chat_invite */
-	oscar_chat_leave,		/* chat_leave */
-	NULL,					/* chat_whisper */
-	oscar_send_chat,		/* chat_send */
-	oscar_keepalive,		/* keepalive */
-	NULL,					/* register_user */
-	NULL,					/* get_cb_info */
-	NULL,					/* get_cb_away */
-	oscar_alias_buddy,		/* alias_buddy */
-	oscar_move_buddy,		/* group_buddy */
-	oscar_rename_group,		/* rename_group */
-	NULL,					/* buddy_free */
-	oscar_convo_closed,		/* convo_closed */
-	oscar_normalize,		/* normalize */
-	oscar_set_icon,			/* set_buddy_icon */
-	NULL,					/* remove_group */
-	NULL,					/* get_cb_real_name */
-	NULL,					/* set_chat_topic */
-	NULL,					/* find_blist_chat */
-	NULL,					/* roomlist_get_list */
-	NULL,					/* roomlist_cancel */
-	NULL,					/* roomlist_expand_category */
-	oscar_can_receive_file,	/* can_receive_file */
-	oscar_send_file,		/* send_file */
-	oscar_new_xfer,			/* new_xfer */
-	oscar_offline_message,	/* offline_message */
-	NULL,					/* whiteboard_prpl_ops */
-	NULL,				/* send_raw */
-};
-
-static GaimPluginInfo info =
-{
-	GAIM_PLUGIN_MAGIC,
-	GAIM_MAJOR_VERSION,
-	GAIM_MINOR_VERSION,
-	GAIM_PLUGIN_PROTOCOL,                             /**< type           */
-	NULL,                                             /**< ui_requirement */
-	0,                                                /**< flags          */
-	NULL,                                             /**< dependencies   */
-	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
-
-	"prpl-oscar",                                     /**< id             */
-	"AIM/ICQ",                                        /**< name           */
-	VERSION,                                          /**< version        */
-	                                                  /**  summary        */
-	N_("AIM/ICQ Protocol Plugin"),
-	                                                  /**  description    */
-	N_("AIM/ICQ Protocol Plugin"),
-	NULL,                                             /**< author         */
-	GAIM_WEBSITE,                                     /**< homepage       */
-
-	NULL,                                             /**< load           */
-	NULL,                                             /**< unload         */
-	NULL,                                             /**< destroy        */
-
-	NULL,                                             /**< ui_info        */
-	&prpl_info,                                       /**< extra_info     */
-	NULL,
-	oscar_actions
-};
-
-static void
-init_plugin(GaimPlugin *plugin)
-{
-	GaimAccountOption *option;
-
-	option = gaim_account_option_string_new(_("Server"), "server", OSCAR_DEFAULT_LOGIN_SERVER);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = gaim_account_option_int_new(_("Port"), "port", OSCAR_DEFAULT_LOGIN_PORT);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = gaim_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = gaim_account_option_bool_new(
-		_("Always use AIM/ICQ proxy server for file transfers\n(slower, but does not reveal your IP address)"), "always_use_rv_proxy",
-		OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	/* Preferences */
-	gaim_prefs_add_none("/plugins/prpl/oscar");
-	gaim_prefs_add_bool("/plugins/prpl/oscar/recent_buddies", FALSE);
-	gaim_prefs_add_bool("/plugins/prpl/oscar/show_idle", FALSE);
-	gaim_prefs_remove("/plugins/prpl/oscar/always_use_rv_proxy");
-}
-
-GAIM_INIT_PLUGIN(oscar, init_plugin, info);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libgaim/protocols/oscar/oscarcommon.h	Tue Nov 14 04:04:04 2006 +0000
@@ -0,0 +1,81 @@
+/* gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+/* oscarcommon.h contains prototypes for the prpl functions used by libaim.c
+ * and libicq.c
+ */
+
+#include "accountopt.h"
+#include "internal.h"
+#include "prpl.h"
+#include "version.h"
+
+#define OSCAR_DEFAULT_LOGIN_SERVER "login.oscar.aol.com"
+#define OSCAR_DEFAULT_LOGIN_PORT 5190
+#define OSCAR_DEFAULT_CUSTOM_ENCODING "ISO-8859-1"
+#define OSCAR_DEFAULT_AUTHORIZATION TRUE
+#define OSCAR_DEFAULT_HIDE_IP TRUE
+#define OSCAR_DEFAULT_WEB_AWARE FALSE
+#define OSCAR_DEFAULT_ALWAYS_USE_RV_PROXY FALSE
+
+const char *oscar_list_icon_icq(GaimAccount *a, GaimBuddy *b);
+const char *oscar_list_icon_aim(GaimAccount *a, GaimBuddy *b);
+void oscar_list_emblems(GaimBuddy *b, const char **se, const char **sw, const char **nw, const char **ne);
+char *oscar_status_text(GaimBuddy *b);
+void oscar_tooltip_text(GaimBuddy *b, GString *str, gboolean full);
+GList *oscar_status_types(GaimAccount *account);
+GList *oscar_blist_node_menu(GaimBlistNode *node);
+GList *oscar_chat_info(GaimConnection *gc);
+GHashTable *oscar_chat_info_defaults(GaimConnection *gc, const char *chat_name);
+void oscar_login(GaimAccount *account);
+void oscar_close(GaimConnection *gc);
+int oscar_send_im(GaimConnection *gc, const char *name, const char *message, GaimMessageFlags imflags);
+void oscar_set_info(GaimConnection *gc, const char *rawinfo);
+unsigned int oscar_send_typing(GaimConnection *gc, const char *name, GaimTypingState state);
+void oscar_get_info(GaimConnection *gc, const char *name);
+void oscar_set_status(GaimAccount *account, GaimStatus *status);
+void oscar_set_idle(GaimConnection *gc, int time);
+void oscar_change_passwd(GaimConnection *gc, const char *old, const char *new);
+void oscar_add_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group);
+void oscar_remove_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group);
+void oscar_add_permit(GaimConnection *gc, const char *who);
+void oscar_add_deny(GaimConnection *gc, const char *who);
+void oscar_rem_permit(GaimConnection *gc, const char *who);
+void oscar_rem_deny(GaimConnection *gc, const char *who);
+void oscar_set_permit_deny(GaimConnection *gc);
+void oscar_join_chat(GaimConnection *gc, GHashTable *data);
+char *oscar_get_chat_name(GHashTable *data);
+void oscar_chat_invite(GaimConnection *gc, int id, const char *message, const char *name);
+void oscar_chat_leave(GaimConnection *gc, int id);
+int oscar_send_chat(GaimConnection *gc, int id, const char *message, GaimMessageFlags flags);
+void oscar_keepalive(GaimConnection *gc);
+void oscar_alias_buddy(GaimConnection *gc, const char *name, const char *alias);
+void oscar_move_buddy(GaimConnection *gc, const char *name, const char *old_group, const char *new_group);
+void oscar_rename_group(GaimConnection *gc, const char *old_name, GaimGroup *group, GList *moved_buddies);
+void oscar_convo_closed(GaimConnection *gc, const char *who);
+const char *oscar_normalize(const GaimAccount *account, const char *str);
+void oscar_set_icon(GaimConnection *gc, const char *iconfile);
+gboolean oscar_can_receive_file(GaimConnection *gc, const char *who);
+void oscar_send_file(GaimConnection *gc, const char *who, const char *file);
+GaimXfer *oscar_new_xfer(GaimConnection *gc, const char *who);
+gboolean oscar_offline_message(const GaimBuddy *buddy);
+GList *oscar_actions(GaimPlugin *plugin, gpointer context);