Mercurial > pidgin
changeset 22470:0daeabc1a185
merge of '1a03b83dbe8f941cb6de4ed3659bf7b2335d642d'
and 'bda22ced802132e741a614cf3e67a599e9b08b0c'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 13 Mar 2008 01:24:51 +0000 |
| parents | dc599fcdac8d (diff) 22fce0be8ed0 (current diff) |
| children | f693749f82d2 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/plugins/cap/cap.c Thu Mar 13 01:24:21 2008 +0000 +++ b/pidgin/plugins/cap/cap.c Thu Mar 13 01:24:51 2008 +0000 @@ -113,11 +113,8 @@ stats = g_hash_table_lookup(_buddy_stats, buddy->name); if(!stats) { - stats = g_malloc(sizeof(CapStatistics)); + stats = g_malloc0(sizeof(CapStatistics)); stats->last_message = -1; - stats->last_message_status_id = NULL; - stats->last_status_id = NULL; - stats->prediction = NULL; stats->buddy = buddy; stats->last_seen = -1; stats->last_status_id = "";
--- a/pidgin/plugins/gevolution/gevo-util.c Thu Mar 13 01:24:21 2008 +0000 +++ b/pidgin/plugins/gevolution/gevo-util.c Thu Mar 13 01:24:51 2008 +0000 @@ -109,6 +109,10 @@ else protocol_field = E_CONTACT_IM_ICQ; } + else if (!strcmp(protocol_id, "prpl-aim")) + protocol_field = E_CONTACT_IM_AIM; + else if (!strcmp(protocol_id, "prpl-icq")) + protocol_field = E_CONTACT_IM_ICQ; else if (!strcmp(protocol_id, "prpl-msn")) protocol_field = E_CONTACT_IM_MSN; else if (!strcmp(protocol_id, "prpl-yahoo"))