Mercurial > pidgin
changeset 22473:8aa07f5d1524
merge of '5d1e097eb7e127d7b1bc269ee71992478f79a182'
and 'd455bbecfc1b674264ec56b2b4af22db845058ed'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 13 Mar 2008 01:44:01 +0000 |
| parents | 723c7f610d2d (current diff) 713310b97512 (diff) |
| children | 53ffaf968813 |
| files | |
| diffstat | 3 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c Thu Mar 13 01:38:04 2008 +0000 +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Thu Mar 13 01:44:01 2008 +0000 @@ -313,9 +313,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"); } @@ -394,10 +396,12 @@ } 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/gevolution.c Thu Mar 13 01:38:04 2008 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Thu Mar 13 01:44:01 2008 +0000 @@ -109,10 +109,12 @@ 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 Thu Mar 13 01:38:04 2008 +0000 +++ b/pidgin/plugins/gevolution/new_person_dialog.c Thu Mar 13 01:44:01 2008 +0000 @@ -148,6 +148,10 @@ 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"))