2005-10-04 [colin] 1.9.15cvs10

	* src/toolbar.c
		Use Compose instead of Email by default.
		Spotted by wwp.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 523d9fbeba8083968b7b845949499da7466443b5..0279c8f8bae770fd7b03959b9f516bf2a6636bba 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-10-04 [colin]     1.9.15cvs10
+
+       * src/toolbar.c
+               Use Compose instead of Email by default.
+               Spotted by wwp.
+
 2005-10-04 [colin]     1.9.15cvs9
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 5702d0776342415cf03d6972596317368a579ed1..ee29de6958ec01e51f8cff7f14660f261b7077dc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -846,3 +846,4 @@
 ( cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/export.c;  cvs diff -u -r 1.13.2.10 -r 1.13.2.11 src/import.c;  cvs diff -u -r 1.28.2.10 -r 1.28.2.11 src/mbox.c;  cvs diff -u -r 1.14.2.21 -r 1.14.2.22 src/plugins/trayicon/trayicon.c;  ) > 1.9.15cvs7.patchset
 ( cvs diff -u -r 1.14.2.22 -r 1.14.2.23 src/plugins/trayicon/trayicon.c;  ) > 1.9.15cvs8.patchset
 ( cvs diff -u -r 1.213.2.60 -r 1.213.2.61 src/folder.c;  cvs diff -u -r 1.87.2.19 -r 1.87.2.20 src/folder.h;  cvs diff -u -r 1.207.2.66 -r 1.207.2.67 src/folderview.c;  cvs diff -u -r 1.179.2.74 -r 1.179.2.75 src/imap.c;  cvs diff -u -r 1.1.4.21 -r 1.1.4.22 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/etpan/imap-thread.h;  ) > 1.9.15cvs9.patchset
+( cvs diff -u -r 1.43.2.26 -r 1.43.2.27 src/toolbar.c;  ) > 1.9.15cvs10.patchset

diff --git a/configure.ac b/configure.ac
index 65f49d890d482a5812170dbf0505e9a37d197dce..aa93d8f1e3781e2c505bc80f4d0e2ba9af099e1b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/toolbar.c b/src/toolbar.c
index 056baeb27511bcab26e5693cad763c35e7e2d4ac..c55f01748c0dff88c354a5b4cfb2d3da8cde4df9 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -386,7 +386,7 @@ static void toolbar_set_default_main(void)
                { A_RECEIVE_ALL,   STOCK_PIXMAP_MAIL_RECEIVE_ALL,     _("Get All") },
                { A_SEPARATOR,     0,                                 ("")         }, 
                { A_SEND_QUEUED,   STOCK_PIXMAP_MAIL_SEND_QUEUE,      _("Send")    },
-               { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,         _("Email")   },
+               { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,         _("Compose") },
                { A_SEPARATOR,     0,                                 ("")         },
                { A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY,           _("Reply")   }, 
                { A_REPLY_ALL,     STOCK_PIXMAP_MAIL_REPLY_TO_ALL,    _("All")     },