Fixes #15687 by registering for chat-joined for chats (instead of fix-15687

Thu, 09 Nov 2017 17:31:16 +0000

author
cmeerw@quadriceps.cmeerw.net
date
Thu, 09 Nov 2017 17:31:16 +0000
branch
fix-15687
changeset 38754
ce9ac4939540
parent 38739
f635c3d8cda9
child 38755
d68a5cbddc8e
child 38763
66ca71e9e580

Fixes #15687 by registering for chat-joined for chats (instead of
conversation-created) as persistent chats can be re-joined after
re-connection.

pidgin/gtkblist.c file | annotate | diff | comparison | revisions
--- a/pidgin/gtkblist.c	Thu Oct 19 23:48:13 2017 -0500
+++ b/pidgin/gtkblist.c	Thu Nov 09 17:31:16 2017 +0000
@@ -4729,6 +4729,15 @@
 				}
 			}
 			break;
+		default:
+			break;
+	}
+}
+
+static void
+chat_joined_cb(PurpleConversation *conv, PidginBuddyList *gtkblist)
+{
+	switch (conv->type) {
 		case PURPLE_CONV_TYPE_CHAT:
 			{
 				PurpleChat *chat = purple_blist_find_chat(conv->account, conv->name);
@@ -6095,6 +6104,9 @@
 	purple_signal_connect(handle, "conversation-created", gtkblist,
 	                      PURPLE_CALLBACK(conversation_created_cb),
 	                      gtkblist);
+	purple_signal_connect(handle, "chat-joined", gtkblist,
+	                      PURPLE_CALLBACK(chat_joined_cb),
+	                      gtkblist);
 
 	gtk_widget_hide(gtkblist->headline_hbox);
 

mercurial