[Pkg-privacy-commits] [pidgin-otr] 166/255: Remove OTR menu for non-OTR conversation tabs

[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 600cc425738184908000af999c2eb9cc17fc7e55
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Sun Sep 2 16:20:00 2012 -0400

    Remove OTR menu for non-OTR conversation tabs
    
    When switching to a conversation tab for which the user has explicitly
    disabled OTR, remove the OTR menus from the top menu bar.  Thanks to
    Greg Troxel <gdt at ir.bbn.com> for reporting the issue.
---
 ChangeLog    | 7 +++++++
 gtk-dialog.c | 1 +
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index aa8e97f..2c4f541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-02
+
+	* gtk-dialog.c (otrg_gtk_dialog_new_purple_conv): When switching
+	to a conversation tab for which the user has explicitly disabled
+	OTR, remove the OTR menus from the top menu bar.  Thanks to Greg
+	Troxel <gdt at ir.bbn.com> for reporting the issue.
+
 2012-08-27
 
 	* otr-plugin.c: Add a timer_control callback for the last-minute
diff --git a/gtk-dialog.c b/gtk-dialog.c
index ebb0a71..725c78c 100644
--- a/gtk-dialog.c
+++ b/gtk-dialog.c
@@ -2898,6 +2898,7 @@ static void otrg_gtk_dialog_new_purple_conv(PurpleConversation *conv)
 
     /* OTR is disabled for this buddy */
     if (prefs.policy == OTRL_POLICY_NEVER) {
+	otr_destroy_top_menu_objects(conv);
 	return;
     }
 

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