Merged in cmeerw/pidgin/fix-15687 (pull request #285) release-2.x.y

Fri, 17 Nov 2017 02:32:31 +0000

author
Gary Kramlich <grim@reaperworld.com>
date
Fri, 17 Nov 2017 02:32:31 +0000
branch
release-2.x.y
changeset 38755
d68a5cbddc8e
parent 38753
114172c732ea (current diff)
parent 38754
ce9ac4939540 (diff)
child 38756
4fe4868c09ef

Merged in cmeerw/pidgin/fix-15687 (pull request #285)

Fixes #15687

Approved-by: Eion Robb <eionrobb@gmail.com>
Approved-by: Gary Kramlich <grim@reaperworld.com>

--- a/pidgin/gtkblist.c	Tue Nov 14 07:14:55 2017 +0000
+++ b/pidgin/gtkblist.c	Fri Nov 17 02:32:31 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