From: Colin Leroy <colin@colino.net>
Date: Sun, 4 Dec 2005 11:41:48 +0000 (+0000)
Subject: 2005-12-04 [colin]	1.9.100cvs59
X-Git-Tag: rel_2_0_0~158
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=9d9e36d4ff9933599e9a911d11178213f2955eb6

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 4903882d6..267e2fd3d 100644
--- 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 93e0fa733..8a3d6f312 100644
--- 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 029e4e90b..e54d89ac7 100644
--- 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 f8d31e85a..6e1728e59 100644
--- 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},