From: Colin Leroy Date: Tue, 4 Oct 2005 16:33:01 +0000 (+0000) Subject: 2005-10-04 [colin] 1.9.15cvs10 X-Git-Tag: rel_1_9_99~129 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=120cd87a6528f72f3345294876de45b5f276b700 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 523d9fbeb..0279c8f8b 100644 --- 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 5702d0776..ee29de695 100644 --- 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 65f49d890..aa93d8f1e 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=9 +EXTRA_VERSION=10 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/toolbar.c b/src/toolbar.c index 056baeb27..c55f01748 100644 --- 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") },