pidgin: d455bbec: More gevolution fixes for the prpl-oscar...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: d455bbecfc1b674264ec56b2b4af22db845058ed
Ancestor: 1a03b83dbe8f941cb6de4ed3659bf7b2335d642d
Author: nosnilmot at pidgin.im
Date: 2008-03-13T01:43:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d455bbecfc1b674264ec56b2b4af22db845058ed

Modified files:
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/gevolution/new_person_dialog.c

ChangeLog: 

More gevolution fixes for the prpl-oscar -> prpl-aim/icq split

-------------- next part --------------
============================================================
--- pidgin/plugins/gevolution/add_buddy_dialog.c	3fa7d0735dcec623fbffd049e2a3849d1cb87bd8
+++ pidgin/plugins/gevolution/add_buddy_dialog.c	8b7b1d419dbb94456f525e955de8b610fbcce991
@@ -313,9 +313,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");
 		}
@@ -394,10 +396,12 @@ 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/gevolution.c	c70047d8abf00cb09cf1b6e22975cecaa3e480b9
+++ pidgin/plugins/gevolution/gevolution.c	ed2b7e846c231389093ee12d2c6b082131e4fc61
@@ -109,10 +109,12 @@ 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	9bd4deba3fbc490dee8123161a811e891bbe110f
+++ pidgin/plugins/gevolution/new_person_dialog.c	0c0d2ea85c02ce423f12f46dc794c7b4bee1c1a9
@@ -148,6 +148,10 @@ add_cb(GtkWidget *w, GevoNewPersonDialog
 			else
 				field = E_CONTACT_IM_AIM;
 		}
+		else if (!strcmp(im_service, "prpl-aim"))
+			field = E_CONTACT_IM_AIM;
+		else if (!strcmp(im_service, "prpl-icq"))
+			field = E_CONTACT_IM_ICQ;
 		else if (!strcmp(im_service, "prpl-yahoo"))
 			field = E_CONTACT_IM_YAHOO;
 		else if (!strcmp(im_service, "prpl-jabber"))