pidgin/pidgin

Merged pidgin/main into default

2016-02-12, Jerin Philip
c0de6a76f8b0
Merged pidgin/main into default
--- a/pidgin/plugins/cap/cap.c Fri Feb 12 17:07:55 2016 +0530
+++ b/pidgin/plugins/cap/cap.c Fri Feb 12 17:10:51 2016 +0530
@@ -345,7 +345,7 @@
guint interval, words;
CapStatistics *stats = NULL;
- buddy = purple_blist_find_buddy(account, purple_message_get_who(msg));
+ buddy = purple_blist_find_buddy(account, purple_message_get_recipient(msg));
if (buddy == NULL)
return;
@@ -355,7 +355,7 @@
stats = get_stats_for(buddy);
- insert_word_count(purple_account_get_username(account), purple_message_get_who(msg), words);
+ insert_word_count(purple_account_get_username(account), purple_message_get_recipient(msg), words);
stats->last_message = time(NULL);
stats->last_message_status_id = purple_status_get_id(get_status_for(buddy));
if(stats->timeout_source_id != 0)