From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Sat, 16 Mar 2002 20:51:31 +0000 (+0000)
Subject: revert because it crashes on Reply and Compose
X-Git-Tag: rel_0_7_5~125
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=6026990c10e6e0160413b0b1c34f63d29150d454

revert because it crashes on Reply and Compose
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1c2af2b37..3f3ea9d9b 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,10 +1,3 @@
-2002-03-16 [alfons]	0.7.4claws15
-
-	* src/compose.c
-	* src/prefs_actions.c
-	* src/mainwindow.c
-		move Edit/Actions to Tool/Actions
-
 2002-03-16 [paul]	0.7.4claws14
 
 	* src/messageview.c
diff --git a/configure.in b/configure.in
index b79e372ed..6a2f3741a 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws15
+EXTRA_VERSION=claws14
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index b69c07746..3333d5c3a 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -4472,7 +4472,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 	}
 #endif
 
-	update_compose_actions_menu(ifactory, "/Tool/Actions", compose);
+	update_compose_actions_menu(ifactory, "/Edit/Actions", compose);
 
 
 	undostruct = undo_init(text);
diff --git a/src/mainwindow.c b/src/mainwindow.c
index fe4f75835..2fcaddb32 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -492,6 +492,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
 	{N_("/_Edit/_Find in current message..."),
 						"<control>F", search_cb, 0, NULL},
 	{N_("/_Edit/_Search folder..."),	"<shift><control>F", search_cb, 1, NULL},
+	{N_("/_Edit/---"),			NULL, NULL, 0, "<Separator>"},
+	{N_("/_Edit/Actio_ns"),			NULL, NULL, 0, "<Branch>"},
 
 	{N_("/_View"),				NULL, NULL, 0, "<Branch>"},
 	{N_("/_View/Separate _Folder Tree"),	NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER,  "<ToggleItem>"},
@@ -683,9 +685,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
 						NULL, create_filter_cb, FILTER_BY_TO, NULL},
 	{N_("/_Tool/_Create filter rule/by _Subject"),
 						NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
-	
-	{N_("/_Tool/Actio_ns"),			NULL, NULL, 0, "<Branch>"},
-	
 	{N_("/_Tool/---"),			NULL, NULL, 0, "<Separator>"},
 	{N_("/_Tool/E_xecute"),			"X", execute_summary_cb, 0, NULL},
 	{N_("/_Tool/---"),			NULL, NULL, 0, "<Separator>"},
@@ -1560,7 +1559,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 		/* {"/File/Close", M_UNLOCKED}, */
 		{"/File/Exit" , M_UNLOCKED},
 
-		{"/Tool/Actions"		   , M_MSG_EXIST},
+		{"/Edit/Actions"		   , M_MSG_EXIST},
 		{"/Edit/Select thread"		   , M_SINGLE_TARGET_EXIST},
 		{"/View/Sort"                      , M_MSG_EXIST},
 		{"/View/Thread view"               , M_EXEC},
diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 09b3b71df..4c39766ac 100644
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -888,7 +888,7 @@ static void prefs_actions_ok		(GtkWidget *widget, gpointer data)
 void update_mainwin_actions_menu(GtkItemFactory *ifactory, 
 				 MainWindow *mainwin)
 {
-	update_actions_menu(ifactory, "/Tool/Actions", 
+	update_actions_menu(ifactory, "/Edit/Actions", 
 			    mainwin_actions_execute_cb, 
 			    mainwin);
 }