/pidgin/main: 51c392efda58: facebook: ensure the local user is o...

Changeset: 51c392efda586f7a012e2de1206a4f1e7695bd7d
Author:	 James Geboski <[email protected]>
Date:	 2016-01-14 16:43 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/51c392efda58

Description:

facebook: ensure the local user is only added to inactive group chats

This is a regression introduced by 67131d0.

diffstat:

 libpurple/protocols/facebook/facebook.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (17 lines):

diff --git a/libpurple/protocols/facebook/facebook.c b/libpurple/protocols/facebook/facebook.c
--- a/libpurple/protocols/facebook/facebook.c
+++ b/libpurple/protocols/facebook/facebook.c
@@ -620,8 +620,11 @@ fb_cb_api_thread(FbApi *api, FbApiThread
 		active = purple_chat_conversation_get_users_count(chat) > 0;
 	}
 
-	name = purple_account_get_username(acct);
-	purple_chat_conversation_add_user(chat, name, NULL, 0, FALSE);
+	if (!active) {
+		name = purple_account_get_username(acct);
+		purple_chat_conversation_add_user(chat, name, NULL, 0, FALSE);
+	}
+
 	purple_chat_conversation_set_topic(chat, NULL, thrd->topic);
 
 	for (l = thrd->users; l != NULL; l = l->next) {

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits