comparison: pidgin/plugins/gevolution/gevo-util.c
pidgin/plugins/gevolution/gevo-util.c
- changeset 38240
- 0552f69f1996
- parent 37143
- 728319cb659f
- parent 38089
- da90fe7312d3
- child 38358
- 30ba44276e74
equal
deleted
inserted
replaced
| 38204:7ccb54f5d342 | 38240:0552f69f1996 |
|---|---|
| 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-msn")) | |
| 107 protocol_field = E_CONTACT_IM_MSN; | |
| 108 else if (!strcmp(protocol_id, "prpl-yahoo")) | |
| 109 protocol_field = E_CONTACT_IM_YAHOO; | |
| 110 else if (!strcmp(protocol_id, "prpl-jabber")) | 106 else if (!strcmp(protocol_id, "prpl-jabber")) |
| 111 protocol_field = E_CONTACT_IM_JABBER; | 107 protocol_field = E_CONTACT_IM_JABBER; |
| 112 else if (!strcmp(protocol_id, "prpl-novell")) | 108 else if (!strcmp(protocol_id, "prpl-novell")) |
| 113 protocol_field = E_CONTACT_IM_GROUPWISE; | 109 protocol_field = E_CONTACT_IM_GROUPWISE; |
| 114 else if (!strcmp(protocol_id, "prpl-gg")) | 110 else if (!strcmp(protocol_id, "prpl-gg")) |
| 186 { | 182 { |
| 187 mail = g_strdup(e_contact_get(contact, E_CONTACT_EMAIL_1)); | 183 mail = g_strdup(e_contact_get(contact, E_CONTACT_EMAIL_1)); |
| 188 g_object_unref(contact); | 184 g_object_unref(contact); |
| 189 } | 185 } |
| 190 | 186 |
| 191 if (mail == NULL) | |
| 192 { | |
| 193 PurpleAccount *account = purple_buddy_get_account(buddy); | |
| 194 const char *protocol_id = purple_account_get_protocol_id(account); | |
| 195 | |
| 196 if (!strcmp(protocol_id, "prpl-msn")) | |
| 197 { | |
| 198 mail = g_strdup(purple_normalize(account, | |
| 199 purple_buddy_get_name(buddy))); | |
| 200 } | |
| 201 else if (!strcmp(protocol_id, "prpl-yahoo")) | |
| 202 { | |
| 203 mail = g_strdup_printf("%s@yahoo.com", | |
| 204 purple_normalize(account, | |
| 205 purple_buddy_get_name(buddy))); | |
| 206 } | |
| 207 } | |
| 208 | |
| 209 return mail; | 187 return mail; |
| 210 } | 188 } |
