/pidgin/main: 220fb09c4056: Finch-OTR: update e2ee menu when swi...

[Tomasz Wasilczyk]

Changeset: 220fb09c4056e670858ca8d46d769953117826d1
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-27 01:30 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/220fb09c4056

Description:

Finch-OTR: update e2ee menu when switching active conversation

diffstat:

 finch/gntconv.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (25 lines):

diff --git a/finch/gntconv.c b/finch/gntconv.c
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -966,10 +966,8 @@ finch_destroy_conversation(PurpleConvers
 	/* do stuff here */
 	FinchConv *ggc = FINCH_CONV(conv);
 	ggc->list = g_list_remove(ggc->list, conv);
-	if (ggc->list && conv == ggc->active_conv) {
-		ggc->active_conv = ggc->list->data;
-		gg_setup_commands(ggc, TRUE);
-	}
+	if (ggc->list && conv == ggc->active_conv)
+		finch_conversation_set_active(ggc->list->data);
 
 	if (ggc->list == NULL) {
 		g_free(ggc->u.chat);
@@ -1586,6 +1584,8 @@ void finch_conversation_set_active(Purpl
 	title = get_conversation_title(conv, account);
 	gnt_screen_rename_widget(ggconv->window, title);
 	g_free(title);
+
+	generate_e2ee_menu(ggconv);
 }
 
 void finch_conversation_set_info_widget(PurpleConversation *conv, GntWidget *widget)