[Pkg-privacy-commits] [pidgin-otr] 04/14: * gtk-conv.c: Don't delete the OTR menus if a non-foreground conversation window is closed.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to tag release_3_2_1
in repository pidgin-otr.

commit 50024de64a0349f0088c7db91ea45bc42fd11fc7
Author: Rob Smits <rdfsmits at cs.uwaterloo.ca>
Date:   Mon May 14 09:23:27 2012 -0400

    	* gtk-conv.c: Don't delete the OTR menus if a non-foreground
    	conversation window is closed.
---
 ChangeLog    | 5 +++++
 gtk-dialog.c | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f7ec889..5062753 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-07
+
+	* gtk-conv.c: Don't delete the OTR menus if a non-foreground
+	conversation window is closed.
+
 2008-06-19
 
 	* Makefile.static: Forgot to add tooltipmenu.o to
diff --git a/gtk-dialog.c b/gtk-dialog.c
index 03d4602..de342a8 100644
--- a/gtk-dialog.c
+++ b/gtk-dialog.c
@@ -2173,6 +2173,12 @@ static void conversation_destroyed(PurpleConversation *conv, void *data)
     otrg_gtk_dialog_free_smp_data(conv);
 
     gtkconv = PIDGIN_CONVERSATION ( conv );
+
+    /* Only delete the OTR menus if we're the active conversation */
+    if (gtkconv != pidgin_conv_window_get_active_gtkconv(gtkconv->win)) {
+	return;
+    }
+
     win = pidgin_conv_get_window ( gtkconv );
     menu_list = g_hash_table_lookup ( otr_win_menus, win );
     iter = menu_list;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git