pidgin: 27110c4e: Remove a bunch of old references to prpl...
markdoliner at pidgin.im
markdoliner at pidgin.im
Mon Mar 29 19:40:43 EDT 2010
-----------------------------------------------------------------
Revision: 27110c4e60a08009c4f2f261ff5b6c7fe4caacec
Ancestor: dadb590a21abe478365502368b3f5e7598334a1a
Author: markdoliner at pidgin.im
Date: 2010-03-29T23:35:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/27110c4e60a08009c4f2f261ff5b6c7fe4caacec
Modified 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
ChangeLog:
Remove a bunch of old references to prpl-oscar
-------------- next part --------------
============================================================
--- libpurple/plugins/perl/scripts/account.pl a6cdfbdb4525144ef143b051dc13306676b64c4d
+++ libpurple/plugins/perl/scripts/account.pl bd8d366432281072a139a8ab912b68c1fb11e404
@@ -27,7 +27,7 @@ use Purple;
# 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 {
============================================================
--- libpurple/plugins/perl/scripts/buddy_list.pl 217ca7752dab428a6e4afd0c84d4f2e0e809827b
+++ libpurple/plugins/perl/scripts/buddy_list.pl 5e488be6f252b3200bf2a95a0a680bfe1e1f2b8a
@@ -24,7 +24,7 @@ use Purple;
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 {
============================================================
--- libpurple/plugins/perl/scripts/conversation.pl 2e692e2f69eb6d2b7b97216bc19ed9edaa80cb00
+++ libpurple/plugins/perl/scripts/conversation.pl 7bceac86bc8a1cacfb8d22b06f36a1862a01b10f
@@ -30,7 +30,7 @@ use Purple;
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 {
============================================================
--- libpurple/plugins/perl/scripts/plugin_pref.pl 31fb2680668448d320c76212b8879c76150d3e89
+++ libpurple/plugins/perl/scripts/plugin_pref.pl 3168bbf31db0aee8539be161836249194a822b1a
@@ -28,7 +28,7 @@ use Purple;
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();
============================================================
--- libpurple/savedstatuses.c 7572a1ede9dc1eb57c9120402891644145265bfb
+++ libpurple/savedstatuses.c c9af476df86d345fecfdbc23d84b60a2ac8b1aeb
@@ -436,12 +436,12 @@ parse_substatus(xmlnode *substatus)
* 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>
============================================================
--- libpurple/util.h db948b56acc0167c5b758136544aac5f13c585e2
+++ libpurple/util.h 3477af852f4f1a6d002efb39cb88318c76f0f10d
@@ -1429,6 +1429,10 @@ const char *purple_escape_filename(const
/**
* 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);
============================================================
--- pidgin/gtkblist.c c141c6c5933ed6155d7e93b876e421cc1cdb9543
+++ pidgin/gtkblist.c 5651dfd8b7add119e80ad5a25e53b8b6616772db
@@ -2229,8 +2229,8 @@ parse_vcard(const char *vcard, PurpleGro
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);
============================================================
--- pidgin/plugins/gevolution/add_buddy_dialog.c e88b6c033e6c53b38257d6111dc688ec03dee339
+++ pidgin/plugins/gevolution/add_buddy_dialog.c d54c884de360e39c1d91ef94073ebd56f4e3f4a5
@@ -314,13 +314,11 @@ populate_treeview(GevoAddBuddyDialog *di
}
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 @@ search_changed_cb(GtkEntry *entry, GevoA
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");
}
}
============================================================
--- pidgin/plugins/gevolution/gevo-util.c c93acc60d8070e8d5687baccd3ab8d5f25b32619
+++ pidgin/plugins/gevolution/gevo-util.c cf4d5cb1baf39fc60862eb4a0a6f42305a711781
@@ -99,23 +99,7 @@ gevo_prpl_get_field(PurpleAccount *accou
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;
============================================================
--- pidgin/plugins/gevolution/gevolution.c 5114a0c39570b9f61feef4de54745a63716b8d9e
+++ pidgin/plugins/gevolution/gevolution.c 33bd2910b6ca7f87a212b8023051cfef735c09a8
@@ -111,12 +111,10 @@ update_buddies_from_contact(EContact *co
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);
}
============================================================
--- pidgin/plugins/gevolution/new_person_dialog.c 267d05fb069ce5862635262299f0275434d8588e
+++ pidgin/plugins/gevolution/new_person_dialog.c 799e00becfdb90c0b6c54484ea94a0e65c1f681d
@@ -141,14 +141,7 @@ add_cb(GtkWidget *w, GevoNewPersonDialog
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;
More information about the Commits
mailing list