Mercurial > pidgin.yaz
changeset 30053:0646207f360f
Remove a bunch of old references to prpl-oscar
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 29 Mar 2010 23:35:35 +0000 |
| parents | 99c9595e14a2 |
| children | 70b0f46f2966 84ec9e3cbb6d 36379bf98ed6 |
| files | libpurple/plugins/perl/scripts/account.pl libpurple/plugins/perl/scripts/buddy_list.pl libpurple/plugins/perl/scripts/conversation.pl libpurple/plugins/perl/scripts/plugin_pref.pl libpurple/savedstatuses.c libpurple/util.h pidgin/gtkblist.c pidgin/plugins/gevolution/add_buddy_dialog.c pidgin/plugins/gevolution/gevo-util.c pidgin/plugins/gevolution/gevolution.c pidgin/plugins/gevolution/new_person_dialog.c |
| diffstat | 11 files changed, 14 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/perl/scripts/account.pl Sun Mar 28 18:08:38 2010 +0000 +++ b/libpurple/plugins/perl/scripts/account.pl Mon Mar 29 23:35:35 2010 +0000 @@ -27,7 +27,7 @@ # We will create these on load then destroy them on unload my $TEST_NAME = "perlTestName"; - my $PROTOCOL_ID = "prpl-oscar"; + my $PROTOCOL_ID = "prpl-aim"; sub plugin_init {
--- a/libpurple/plugins/perl/scripts/buddy_list.pl Sun Mar 28 18:08:38 2010 +0000 +++ b/libpurple/plugins/perl/scripts/buddy_list.pl Mon Mar 29 23:35:35 2010 +0000 @@ -24,7 +24,7 @@ my $TEST_GROUP = "UConn Buddies"; my $TEST_NAME = "johnhkelm"; my $TEST_ALIAS = "John Kelm"; - my $PROTOCOL_ID = "prpl-oscar"; + my $PROTOCOL_ID = "prpl-aim"; sub plugin_init {
--- a/libpurple/plugins/perl/scripts/conversation.pl Sun Mar 28 18:08:38 2010 +0000 +++ b/libpurple/plugins/perl/scripts/conversation.pl Mon Mar 29 23:35:35 2010 +0000 @@ -30,7 +30,7 @@ my $TEST_GROUP = "UConn Buddies"; my $TEST_NAME = "johnhkelm"; my $TEST_ALIAS = "John Kelm"; - my $PROTOCOL_ID = "prpl-oscar"; + my $PROTOCOL_ID = "prpl-aim"; sub plugin_init {
--- a/libpurple/plugins/perl/scripts/plugin_pref.pl Sun Mar 28 18:08:38 2010 +0000 +++ b/libpurple/plugins/perl/scripts/plugin_pref.pl Mon Mar 29 23:35:35 2010 +0000 @@ -28,7 +28,7 @@ my $TEST_GROUP = "perlTestGroup"; my $TEST_NAME = "perlTestName"; my $TEST_ALIAS = "perlTestAlias"; - my $PROTOCOL_ID = "prpl-oscar"; + my $PROTOCOL_ID = "prpl-aim"; sub foo { $frame = Purple::PluginPref::Frame->new();
--- a/libpurple/savedstatuses.c Sun Mar 28 18:08:38 2010 +0000 +++ b/libpurple/savedstatuses.c Mon Mar 29 23:35:35 2010 +0000 @@ -436,12 +436,12 @@ * And I can always make them smile * From White Castle to the Nile</message> * <substatus> - * <account protocol='prpl-oscar'>markdoliner</account> + * <account protocol='prpl-aim'>markdoliner</account> * <state>available</state> * <message>The ladies man is here to answer your queries.</message> * </substatus> * <substatus> - * <account protocol='prpl-oscar'>giantgraypanda</account> + * <account protocol='prpl-aim'>giantgraypanda</account> * <state>away</state> * <message>A.C. ain't in charge no more.</message> * </substatus>
--- a/libpurple/util.h Sun Mar 28 18:08:38 2010 +0000 +++ b/libpurple/util.h Mon Mar 29 23:35:35 2010 +0000 @@ -1429,6 +1429,10 @@ /** * This is added temporarily to assist the split of oscar into aim and icq. * This should not be used by plugins. + * + * @deprecated This function should not be used in new code and should be + * removed in 3.0.0. The aim/icq prpl split happened a long + * time ago, and we don't need to keep migrating old data. */ const char *_purple_oscar_convert(const char *act, const char *protocol);
--- a/pidgin/gtkblist.c Sun Mar 28 18:08:38 2010 +0000 +++ b/pidgin/gtkblist.c Mon Mar 29 23:35:35 2010 +0000 @@ -2229,8 +2229,8 @@ return FALSE; } - add_buddies_from_vcard("prpl-oscar", group, aims, alias); - add_buddies_from_vcard("prpl-oscar", group, icqs, alias); + add_buddies_from_vcard("prpl-aim", group, aims, alias); + add_buddies_from_vcard("prpl-icq", group, icqs, alias); add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias); add_buddies_from_vcard("prpl-msn", group, msns, alias); add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c Sun Mar 28 18:08:38 2010 +0000 +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Mon Mar 29 23:35:35 2010 +0000 @@ -314,13 +314,11 @@ } else { - add_ims(dialog, contact, name, aims, "prpl-oscar"); add_ims(dialog, contact, name, aims, "prpl-aim"); add_ims(dialog, contact, name, jabbers, "prpl-jabber"); add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); add_ims(dialog, contact, name, msns, "prpl-msn"); add_ims(dialog, contact, name, icqs, "prpl-icq"); - add_ims(dialog, contact, name, icqs, "prpl-oscar"); add_ims(dialog, contact, name, novells, "prpl-novell"); } } @@ -399,12 +397,10 @@ else { add_ims(dialog, contact, name, aims, "prpl-aim"); - add_ims(dialog, contact, name, aims, "prpl-oscar"); add_ims(dialog, contact, name, jabbers, "prpl-jabber"); add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); add_ims(dialog, contact, name, msns, "prpl-msn"); add_ims(dialog, contact, name, icqs, "prpl-icq"); - add_ims(dialog, contact, name, icqs, "prpl-oscar"); add_ims(dialog, contact, name, novells, "prpl-novell"); } }
--- a/pidgin/plugins/gevolution/gevo-util.c Sun Mar 28 18:08:38 2010 +0000 +++ b/pidgin/plugins/gevolution/gevo-util.c Mon Mar 29 23:35:35 2010 +0000 @@ -99,23 +99,7 @@ protocol_id = purple_account_get_protocol_id(account); - if (!strcmp(protocol_id, "prpl-oscar")) - { - PurpleConnection *gc; - PurplePluginProtocolInfo *prpl_info; - - gc = purple_account_get_connection(account); - - prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); - - if (!strcmp("aim", prpl_info->list_icon(account, buddy))) - { - protocol_field = E_CONTACT_IM_AIM; - } - else - protocol_field = E_CONTACT_IM_ICQ; - } - else if (!strcmp(protocol_id, "prpl-aim")) + if (!strcmp(protocol_id, "prpl-aim")) protocol_field = E_CONTACT_IM_AIM; else if (!strcmp(protocol_id, "prpl-icq")) protocol_field = E_CONTACT_IM_ICQ;
--- a/pidgin/plugins/gevolution/gevolution.c Sun Mar 28 18:08:38 2010 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Mon Mar 29 23:35:35 2010 +0000 @@ -111,12 +111,10 @@ name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); update_ims_from_contact(contact, name, "prpl-aim", E_CONTACT_IM_AIM); - update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_AIM); update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER); update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO); update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN); update_ims_from_contact(contact, name, "prpl-icq", E_CONTACT_IM_ICQ); - update_ims_from_contact(contact, name, "prpl-oscar", E_CONTACT_IM_ICQ); update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE); }
--- a/pidgin/plugins/gevolution/new_person_dialog.c Sun Mar 28 18:08:38 2010 +0000 +++ b/pidgin/plugins/gevolution/new_person_dialog.c Mon Mar 29 23:35:35 2010 +0000 @@ -141,14 +141,7 @@ if (*email) e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email); - if (!strcmp(im_service, "prpl-oscar")) - { - if (isdigit(*username)) - field = E_CONTACT_IM_ICQ; - else - field = E_CONTACT_IM_AIM; - } - else if (!strcmp(im_service, "prpl-aim")) + if (!strcmp(im_service, "prpl-aim")) field = E_CONTACT_IM_AIM; else if (!strcmp(im_service, "prpl-icq")) field = E_CONTACT_IM_ICQ;