summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcmeerw <cmeerw@quadriceps.cmeerw.net>2017-11-09 17:31:16 +0000
committercmeerw <cmeerw@quadriceps.cmeerw.net>2017-11-09 17:31:16 +0000
commitc5465f010920c4279013aec78db432fc038d4101 (patch)
tree6ee06e49001488021d23567a88a1de242d30bfd5
parenteeb7e2ce538bb486e1f5222d838befae540d8872 (diff)
downloadpidgin-c5465f010920c4279013aec78db432fc038d4101.tar.gz
Fixes #15687 by registering for chat-joined for chats (instead of
conversation-created) as persistent chats can be re-joined after re-connection.
-rw-r--r--pidgin/gtkblist.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index 029db85d76..746da67efb 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -4729,6 +4729,15 @@ conversation_created_cb(PurpleConversation *conv, PidginBuddyList *gtkblist)
}
}
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 @@ static void pidgin_blist_show(PurpleBuddyList *list)
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);