[Pkg-privacy-commits] [pidgin-otr] 70/255: * 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 branch experimental
in repository pidgin-otr.

commit 83a033be1a63077d72f0e8f55fe0bbbb233817cc
Author: cypherpunk <cypherpunk>
Date:   Mon Jul 7 14:58:30 2008 +0000

    	* 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 64e5ff6..508db55 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-07-02
 
 	* dialogs.c:
diff --git a/gtk-dialog.c b/gtk-dialog.c
index 7bd32bf..ab4b2da 100644
--- a/gtk-dialog.c
+++ b/gtk-dialog.c
@@ -2187,6 +2187,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