diff -r f35cd65fd935 -r da90fe7312d3 pidgin/plugins/gevolution/add_buddy_dialog.c --- a/pidgin/plugins/gevolution/add_buddy_dialog.c Wed Oct 05 21:14:58 2016 +0200 +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Wed Oct 05 15:10:29 2016 -0500 @@ -288,18 +288,17 @@ { EContact *contact = E_CONTACT(c->data); const char *name; - GList *aims, *jabbers, *yahoos, *icqs, *novells, *ggs; + GList *aims, *jabbers, *icqs, *novells, *ggs; name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); aims = e_contact_get(contact, E_CONTACT_IM_AIM); jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER); - yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU); - if (aims == NULL && jabbers == NULL && yahoos == NULL && + if (aims == NULL && jabbers == NULL && icqs == NULL && novells == NULL && ggs == NULL) { GtkTreeIter iter; @@ -315,7 +314,6 @@ { 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, icqs, "prpl-icq"); add_ims(dialog, contact, name, novells, "prpl-novell"); add_ims(dialog, contact, name, ggs, "prpl-gg"); @@ -364,7 +362,7 @@ { EContact *contact = E_CONTACT(l->data); const char *name; - GList *aims, *jabbers, *yahoos, *icqs, *novells, *ggs; + GList *aims, *jabbers, *icqs, *novells, *ggs; name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); @@ -376,12 +374,11 @@ aims = e_contact_get(contact, E_CONTACT_IM_AIM); jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER); - yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU); - if (aims == NULL && jabbers == NULL && yahoos == NULL && + if (aims == NULL && jabbers == NULL && icqs == NULL && novells == NULL && ggs == NULL) { GtkTreeIter iter; @@ -397,7 +394,6 @@ { 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, icqs, "prpl-icq"); add_ims(dialog, contact, name, novells, "prpl-novell"); add_ims(dialog, contact, name, ggs, "prpl-gg");