talons

commit 6438ecda776a5d16f33e6157df75aaf9130610c8
parent ea5b2b143c3a12d9deca84b209882878c5212a51
Author: Paul Mangan <paul@claws-mail.org>
Date:   Fri,  1 Aug 2008 10:18:57 +0000

2008-08-01 [paul]	3.5.0cvs41

	* src/action.c
		fix crash that occurs because of recent GtkUIManager
		changes. Thanks to Colin

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

4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-01 [paul]	3.5.0cvs41
+
+	* src/action.c
+		fix crash that occurs because of recent GtkUIManager
+		changes. Thanks to Colin
+
 2008-07-31 [colin]	3.5.0cvs40
 
 	* src/addressbook.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3452,3 +3452,4 @@
 ( cvs diff -u -r 1.61.2.80 -r 1.61.2.81 src/account.c;  cvs diff -u -r 1.11.2.10 -r 1.11.2.11 src/account.h;  cvs diff -u -r 1.12.2.51 -r 1.12.2.52 src/action.c;  cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/action.h;  cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/addressitem.h;  cvs diff -u -r 1.382.2.459 -r 1.382.2.460 src/compose.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/edittags.c;  cvs diff -u -r 1.274.2.257 -r 1.274.2.258 src/mainwindow.c;  cvs diff -u -r 1.39.2.49 -r 1.39.2.50 src/mainwindow.h;  cvs diff -u -r 1.83.2.137 -r 1.83.2.138 src/mimeview.c;  cvs diff -u -r 1.395.2.377 -r 1.395.2.378 src/summaryview.c;  cvs diff -u -r 1.5.2.32 -r 1.5.2.33 src/gtk/menu.c;  cvs diff -u -r 1.4.2.17 -r 1.4.2.18 src/gtk/menu.h;  ) > 3.5.0cvs38.patchset
 ( cvs diff -u -r 1.207.2.203 -r 1.207.2.204 src/folderview.c;  cvs diff -u -r 1.20.2.22 -r 1.20.2.23 src/folderview.h;  cvs diff -u -r 1.1.2.59 -r 1.1.2.60 src/imap_gtk.c;  cvs diff -u -r 1.2.2.32 -r 1.2.2.33 src/mh_gtk.c;  cvs diff -u -r 1.2.2.27 -r 1.2.2.28 src/news_gtk.c;  ) > 3.5.0cvs39.patchset
 ( cvs diff -u -r 1.60.2.121 -r 1.60.2.122 src/addressbook.c;  cvs diff -u -r 1.382.2.460 -r 1.382.2.461 src/compose.c;  cvs diff -u -r 1.274.2.258 -r 1.274.2.259 src/mainwindow.c;  cvs diff -u -r 1.94.2.182 -r 1.94.2.183 src/messageview.c;  cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/gtk/menu.c;  cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/gtk/menu.h;  ) > 3.5.0cvs40.patchset
+( cvs diff -u -r 1.12.2.52 -r 1.12.2.53 src/action.c;  ) > 3.5.0cvs41.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=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/action.c b/src/action.c
@@ -117,7 +117,9 @@ static void compose_actions_execute 	(Compose	*compose,
 					 guint		 action_nb,
 					 GtkWidget 	*widget);
 
-static void mainwin_actions_execute_cb 	(MainWindow	*mainwin,
+static void mainwin_actions_execute_cb	(GtkWidget 	*widget, 
+					 gpointer 	 data);
+static void mainwin_actions_execute 	(MainWindow	*mainwin,
 					 guint		 action_nb,
 					 GtkWidget 	*widget);
 
@@ -434,7 +436,7 @@ void actions_execute(gpointer data,
 		     gint source)
 {
 	if (source == TOOLBAR_MAIN) 
-		mainwin_actions_execute_cb((MainWindow*)data, action_nb, widget);
+		mainwin_actions_execute((MainWindow*)data, action_nb, widget);
 	else if (source == TOOLBAR_COMPOSE)
 		compose_actions_execute((Compose*)data, action_nb, widget);
 	else if (source == TOOLBAR_MSGVIEW)
@@ -590,7 +592,14 @@ static void compose_actions_execute(Compose *compose, guint action_nb, GtkWidget
 		compose_action_cb, compose);
 }
 
-static void mainwin_actions_execute_cb(MainWindow *mainwin, guint action_nb,
+static void mainwin_actions_execute_cb(GtkWidget *widget, gpointer data)
+{
+	MainWindow *mainwin = (MainWindow *)data;
+	gint action_nb = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "action_num"));
+	mainwin_actions_execute(mainwin, action_nb, NULL);
+}
+
+static void mainwin_actions_execute(MainWindow *mainwin, guint action_nb,
 				       GtkWidget *widget)
 {
 	GSList *msg_list;