2005-12-04 [colin] 1.9.100cvs59

	* src/plugins/trayicon/trayicon.c
		Remove Get, rename Get All to Get Mail in order to
		be consistent with the default main toolbar

diff --git a/ChangeLog b/ChangeLog
index 4903882d63367937aa8efa8251cebae49f20d031..267e2fd3dbc58e215a187e81325eb28d9eb209a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-04 [colin]     1.9.100cvs59
+
+       * src/plugins/trayicon/trayicon.c
+               Remove Get, rename Get All to Get Mail in order to
+               be consistent with the default main toolbar
+
 2005-12-03 [colin]     1.9.100cvs58
 
        * manual/gpl.xml

diff --git a/PATCHSETS b/PATCHSETS
index 93e0fa7334225822c06cb8749dc7c8e21175ffcd..8a3d6f312c7170284a7cbe79d11ca4b8e4089224 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1042,3 +1042,4 @@
 ( cvs diff -u -r 1.654.2.1085 -r 1.654.2.1086 configure.ac;  ) > 1.9.100cvs56.patchset
 ( cvs diff -u -r 1.100.2.29 -r 1.100.2.30 AUTHORS;  cvs diff -u -r 1.4.2.2 -r 1.4.2.3 po/sv.po;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/authors.h;  ) > 1.9.100cvs57.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/gpl.xml;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/sylpheed-claws-manual.xml;  ) > 1.9.100cvs58.patchset
+( cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/plugins/trayicon/trayicon.c;  ) > 1.9.100cvs59.patchset

diff --git a/configure.ac b/configure.ac
index 029e4e90bc77da28a81283342ed5927adea7af0f..e54d89ac7da545ee4fd7f7f54b9ccb4e484ba8b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=58
+EXTRA_VERSION=59
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index f8d31e85a5335c34437d95f21914ebab6011d370..6e1728e59b12156b7eecf70dc162e89c72a18c24 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -91,8 +91,7 @@ static void resize_cb             (GtkWidget *widget, GtkRequisition *req, gpointer use
 
 static GtkItemFactoryEntry trayicon_popup_menu_entries[] =
 {
-       {N_("/_Get"),                   NULL, trayicon_get_cb,                  0, NULL},
-       {N_("/Get _All"),               NULL, trayicon_get_all_cb,              0, NULL},
+       {N_("/_Get Mail"),              NULL, trayicon_get_all_cb,              0, NULL},
        {N_("/---"),                    NULL, NULL,                             0, "<Separator>"},
        {N_("/_Email"),                 NULL, trayicon_compose_cb,              0, NULL},
        {N_("/Open A_ddressbook"),      NULL, trayicon_addressbook_cb,          0, NULL},