comparison: pidgin/plugins/gevolution/gevo-util.c
pidgin/plugins/gevolution/gevo-util.c
- branch
- release-2.x.y
- changeset 38089
- da90fe7312d3
- parent 38077
- 482a3b3e5c89
- child 38240
- 0552f69f1996
- child 38258
- 9a6551eba09c
equal
deleted
inserted
replaced
| 38088:f35cd65fd935 | 38089:da90fe7312d3 |
|---|---|
| 101 | 101 |
| 102 if (!strcmp(protocol_id, "prpl-aim")) | 102 if (!strcmp(protocol_id, "prpl-aim")) |
| 103 protocol_field = E_CONTACT_IM_AIM; | 103 protocol_field = E_CONTACT_IM_AIM; |
| 104 else if (!strcmp(protocol_id, "prpl-icq")) | 104 else if (!strcmp(protocol_id, "prpl-icq")) |
| 105 protocol_field = E_CONTACT_IM_ICQ; | 105 protocol_field = E_CONTACT_IM_ICQ; |
| 106 else if (!strcmp(protocol_id, "prpl-yahoo")) | |
| 107 protocol_field = E_CONTACT_IM_YAHOO; | |
| 108 else if (!strcmp(protocol_id, "prpl-jabber")) | 106 else if (!strcmp(protocol_id, "prpl-jabber")) |
| 109 protocol_field = E_CONTACT_IM_JABBER; | 107 protocol_field = E_CONTACT_IM_JABBER; |
| 110 else if (!strcmp(protocol_id, "prpl-novell")) | 108 else if (!strcmp(protocol_id, "prpl-novell")) |
| 111 protocol_field = E_CONTACT_IM_GROUPWISE; | 109 protocol_field = E_CONTACT_IM_GROUPWISE; |
| 112 else if (!strcmp(protocol_id, "prpl-gg")) | 110 else if (!strcmp(protocol_id, "prpl-gg")) |
| 161 { | 159 { |
| 162 mail = g_strdup(e_contact_get(contact, E_CONTACT_EMAIL_1)); | 160 mail = g_strdup(e_contact_get(contact, E_CONTACT_EMAIL_1)); |
| 163 g_object_unref(contact); | 161 g_object_unref(contact); |
| 164 } | 162 } |
| 165 | 163 |
| 166 if (mail == NULL) | |
| 167 { | |
| 168 PurpleAccount *account = purple_buddy_get_account(buddy); | |
| 169 const char *prpl_id = purple_account_get_protocol_id(account); | |
| 170 | |
| 171 if (!strcmp(prpl_id, "prpl-yahoo")) | |
| 172 { | |
| 173 mail = g_strdup_printf("%s@yahoo.com", | |
| 174 purple_normalize(account, | |
| 175 purple_buddy_get_name(buddy))); | |
| 176 } | |
| 177 } | |
| 178 | |
| 179 return mail; | 164 return mail; |
| 180 } | 165 } |
