[Pkg-privacy-commits] [pidgin-otr] 63/255: * gtk-dialog.c: Don't try to destroy the submenu when we've already destroyed the menu. Linux doesn't complain about this, but Windows does.

[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 31ec34eecff8a6cfca9835d64c4c2578a70e0940
Author: cypherpunk <cypherpunk>
Date:   Sun Jun 15 20:15:45 2008 +0000

    	* gtk-dialog.c: Don't try to destroy the submenu when we've
    	already destroyed the menu.  Linux doesn't complain about this,
    	but Windows does.
    
    	* packaging/windows/pidgin-otr.msi: Bump version number.
    
    	* Makefile.mingw: Add tooltipmenu.o to link line.
    
    	* Release 3.2.0.
---
 ChangeLog                        | 12 ++++++++++++
 Makefile.mingw                   |  2 +-
 README                           |  2 +-
 gtk-dialog.c                     |  2 --
 packaging/windows/pidgin-otr.nsi |  3 ++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7a6b34d..7ff6d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-06-15
+
+	* gtk-dialog.c: Don't try to destroy the submenu when we've
+	already destroyed the menu.  Linux doesn't complain about this,
+	but Windows does.
+
+	* packaging/windows/pidgin-otr.msi: Bump version number.
+
+	* Makefile.mingw: Add tooltipmenu.o to link line.
+
+	* Release 3.2.0.
+
 2008-06-13
 
 	* po/de.po: Updated German translation from Michael Meier
diff --git a/Makefile.mingw b/Makefile.mingw
index a8864b1..e7626cd 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -55,7 +55,7 @@ override CFLAGS += -g -O2 -Wall -I$(PIDGIN_HEADERS) -I$(PURPLE_HEADERS) \
 all: $(TARGET)
 	$(MAKE) -C po -f Makefile.mingw
 
-$(TARGET): otr-plugin.o ui.o dialogs.o gtk-ui.o gtk-dialog.o
+$(TARGET): otr-plugin.o ui.o dialogs.o gtk-ui.o gtk-dialog.o tooltipmenu.o
 	$(CC) -g -shared $(LDFLAGS) $^ -o $@ $(LDLIBS)
 
 clean:
diff --git a/README b/README
index e4775cf..326ce90 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 	       Off-the-Record Messaging plugin for pidgin
-			  v3.2.0, 13 Jun 2008
+			  v3.2.0, 15 Jun 2008
 
 This is a pidgin plugin which implements Off-the-Record (OTR) Messaging.
 It is known to work (at least) under the Linux and Windows versions of
diff --git a/gtk-dialog.c b/gtk-dialog.c
index 734ffc0..03d4602 100644
--- a/gtk-dialog.c
+++ b/gtk-dialog.c
@@ -1956,7 +1956,6 @@ static void otr_add_top_otr_menu(PurpleConversation *conv) {
 
 
     menu_list = g_list_append(menu_list, topmenuitem);
-    menu_list = g_list_append(menu_list, topmenu);
 
     g_hash_table_replace ( otr_win_menus, win, menu_list );
 }
@@ -2082,7 +2081,6 @@ static void otr_add_buddy_top_menus(PurpleConversation *conv) {
         
         menu_list = g_hash_table_lookup ( otr_win_menus, win );
         menu_list = g_list_append(menu_list, tooltip_menu);
-        menu_list = g_list_append(menu_list, menu);
         
         g_hash_table_replace ( otr_win_menus, win, menu_list );
         
diff --git a/packaging/windows/pidgin-otr.nsi b/packaging/windows/pidgin-otr.nsi
index 7a93ef6..54beb3d 100644
--- a/packaging/windows/pidgin-otr.nsi
+++ b/packaging/windows/pidgin-otr.nsi
@@ -3,6 +3,7 @@
 ;
 ; known issue. installer induced uninstaller abortion causes overwrite
 ; by installer without uninstall.
+; v3.2.0   - New source version.
 ; v3.1.0   - New source version.  Install and uninstall i18n files.
 ; v3.0.0   - Version for pidgin-2.0.0
 ; v3.0.0   - Bump version number.
@@ -24,7 +25,7 @@
 ; todo: SetBrandingImage
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "pidgin-otr"
-!define PRODUCT_VERSION "3.1.0-1"
+!define PRODUCT_VERSION "3.2.0-1"
 !define PRODUCT_PUBLISHER "Cypherpunks CA"
 !define PRODUCT_WEB_SITE "http://otr.cypherpunks.ca/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

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