talons

commit e8c02a862d5004a6cfa21d0facd8223aa1cc7495
parent 5abc9399caa6752c21e4c58c3843e267be087937
Author: Colin Leroy <colin@colino.net>
Date:   Sat, 23 Aug 2008 15:21:18 +0000

2008-08-23 [colin]	3.5.0cvs68

	* src/mainwindow.c
		Fix the account selector button; thanks
		to wwp

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
9
+++++----

4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-23 [colin]	3.5.0cvs68
+
+	* src/mainwindow.c
+		Fix the account selector button; thanks
+		to wwp
+
 2008-08-21 [colin]	3.5.0cvs67
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3479,3 +3479,4 @@
 ( cvs diff -u -r 1.382.2.467 -r 1.382.2.468 src/compose.c;  ) > 3.5.0cvs65.patchset
 ( cvs diff -u -r 1.382.2.468 -r 1.382.2.469 src/compose.c;  cvs diff -u -r 1.204.2.176 -r 1.204.2.177 src/prefs_common.c;  cvs diff -u -r 1.103.2.111 -r 1.103.2.112 src/prefs_common.h;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_wrapping.c;  ) > 3.5.0cvs66.patchset
 ( cvs diff -u -r 1.382.2.469 -r 1.382.2.470 src/compose.c;  cvs diff -u -r 1.50.2.49 -r 1.50.2.50 src/compose.h;  cvs diff -u -r 1.274.2.268 -r 1.274.2.269 src/mainwindow.c;  cvs diff -u -r 1.395.2.382 -r 1.395.2.383 src/summaryview.c;  ) > 3.5.0cvs67.patchset
+( cvs diff -u -r 1.274.2.269 -r 1.274.2.270 src/mainwindow.c;  ) > 3.5.0cvs68.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=67
+EXTRA_VERSION=68
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3762,14 +3762,15 @@ static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event
 				    gpointer data)
 {
 	MainWindow *mainwin = (MainWindow *)data;
-
+	GtkWidget *menu = NULL;
+	
 	if (!event) return FALSE;
 
 	gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-	g_object_set_data(G_OBJECT(mainwin->ac_menu), "menu_button",
-			  widget);
+	
+	menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(mainwin->ac_menu));
 
-	gtk_menu_popup(GTK_MENU(mainwin->ac_menu), NULL, NULL,
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
 		       menu_button_position, widget,
 		       event->button, event->time);