/pidgin/main: a5d1c14b6021: Backed out 187b51ce9922 because it b...

Changeset: a5d1c14b6021cd11d2dccae712e7d29974160dc4
Author:	 dx <[email protected]>
Date:	 2015-12-30 20:05 -0300
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/a5d1c14b6021

Description:

Backed out 187b51ce9922 because it breaks rejoining XMPP MUCs (maybe others) upon reconnection (trac ticket #16724)

diffstat:

 libpurple/server.c |  13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

diffs (23 lines):

diff --git a/libpurple/server.c b/libpurple/server.c
--- a/libpurple/server.c
+++ b/libpurple/server.c
@@ -850,18 +850,7 @@ PurpleConversation *serv_got_joined_chat
 	g_return_val_if_fail(account != NULL, NULL);
 	g_return_val_if_fail(name != NULL, NULL);
 
-	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
-		name, account);
-	if (!conv) {
-		purple_debug_info(NULL, "Opening %s chat on account %s",
-			name, purple_account_get_username(account));
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
-	}
-	else {
-		purple_debug_info(NULL, "Chat %s on account %s already exists",
-			name, purple_account_get_username(account));
-	}
-
+	conv = purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
 	g_return_val_if_fail(conv != NULL, NULL);
 
 	chat = PURPLE_CONV_CHAT(conv);

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