From: Paul Mangan <paul@claws-mail.org>
Date: Wed, 5 Oct 2005 09:48:57 +0000 (+0000)
Subject: 2005-10-05 [paul]	1.9.15cvs13
X-Git-Tag: rel_1_9_99~126
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f81cec780302b943598ee2a538aabb3f20a7704c

2005-10-05 [paul]	1.9.15cvs13

	* src/mainwindow.c
	* src/mainwindow.h
		fix disabled Execute menu item
	* src/toolbar.c
		match the change in 1.9.15cvs10: use Compose
		instead of News by default
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 680f1e66e..ff418f5cd 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2005-10-05 [paul]	1.9.15cvs13
+
+	* src/mainwindow.c
+	* src/mainwindow.h
+		fix disabled Execute menu item
+	* src/toolbar.c
+		match the change in 1.9.15cvs10: use Compose
+		instead of News by default
+
 2005-10-04 [colin]	1.9.15cvs12
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index f593862bc..bcd3f8d52 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -849,3 +849,4 @@
 ( cvs diff -u -r 1.43.2.26 -r 1.43.2.27 src/toolbar.c;  ) > 1.9.15cvs10.patchset
 ( cvs diff -u -r 1.14.2.23 -r 1.14.2.24 src/plugins/trayicon/trayicon.c;  ) > 1.9.15cvs11.patchset
 ( cvs diff -u -r 1.382.2.178 -r 1.382.2.179 src/compose.c;  ) > 1.9.15cvs12.patchset
+( cvs diff -u -r 1.274.2.68 -r 1.274.2.69 src/mainwindow.c;  cvs diff -u -r 1.39.2.8 -r 1.39.2.9 src/mainwindow.h;  cvs diff -u -r 1.43.2.27 -r 1.43.2.28 src/toolbar.c;  ) > 1.9.15cvs13.patchset
diff --git a/configure.ac b/configure.ac
index 1dc78c01f..9216461bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 7cc3a905f..c3f04ca8c 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1762,8 +1762,10 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 	if (inc_is_active())
 		state |= M_INC_ACTIVE;
 
-	if (mainwin->summaryview->deleted > 0)
-		state |= M_DELAYED_FLAGS;
+	if (mainwin->summaryview->deleted > 0 ||
+	    mainwin->summaryview->moved > 0 ||
+	    mainwin->summaryview->copied > 0)
+		state |= M_DELAY_EXEC;
 
 	return state;
 }
@@ -1851,7 +1853,6 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
 		{"/Tools/Create filter rule"           , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
 		{"/Tools/Actions"                      , M_TARGET_EXIST|M_UNLOCKED},
 		{"/Tools/Execute"                      , M_DELAY_EXEC},
-		{"/Tools/Execute"                      , M_DELAYED_FLAGS},
 		{"/Tools/Delete duplicated messages/In selected folder"   , M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
 
 		{"/Configuration", M_UNLOCKED},
diff --git a/src/mainwindow.h b/src/mainwindow.h
index f859e93b7..b2c3dc923 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -48,8 +48,7 @@ typedef enum
 	M_HAVE_NEWS_ACCOUNT   = 1 << 12,
 	M_HIDE_READ_MSG	      = 1 << 13,
 	M_DELAY_EXEC	      = 1 << 14,
-	M_NOT_NEWS	      = 1 << 15,
-	M_DELAYED_FLAGS       = 1 << 16
+	M_NOT_NEWS	      = 1 << 15
 } SensitiveCond;
 
 typedef enum
diff --git a/src/toolbar.c b/src/toolbar.c
index c55f01748..c5f771725 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1428,7 +1428,7 @@ Toolbar *toolbar_create(ToolbarType 	 type,
 		case A_COMPOSE_EMAIL:
 			icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
 			item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-							    _("News"),
+							    _("Compose"),
 							    (""),
 							    (""),
 							    icon_news, G_CALLBACK(toolbar_buttons_cb),