2004-08-22 [colin] 0.9.12cvs76.1

	* src/plugins/trayicon/trayicon.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 2852a22cabb1eef37c3611800815c405b5260cce..9bca193527849be81f7b617e85466410bb558a4b 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-08-22 [colin]     0.9.12cvs76.1
+
+       * src/plugins/trayicon/trayicon.c
+               Sync with HEAD
+
 2004-08-21 [colin]     0.9.12cvs74.2
 
        * src/gtk/colorsel.c

diff --git a/PATCHSETS b/PATCHSETS
index b483fa115818b8977581cbc38b5fa155ab5bcd94..466c26bea127840f65ea00e4224843708c98b380 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -128,3 +128,4 @@
 ( cvs diff -u -r 1.2504.2.14 -r 1.2504.2.15 ChangeLog.claws; cvs diff -u -r 1.382.2.41 -r 1.382.2.42 src/compose.c; cvs diff -u -r 1.274.2.18 -r 1.274.2.19 src/mainwindow.c; ) > 0.9.12cvs70.1.patchset
 ( cvs diff -u -r 1.2504.2.15 -r 1.2504.2.16 ChangeLog.claws; cvs diff -u -r 1.382.2.42 -r 1.382.2.43 src/compose.c; cvs diff -u -r 1.395.2.27 -r 1.395.2.28 src/summaryview.c; cvs diff -u -r 1.43.2.8 -r 1.43.2.9 src/toolbar.c; ) > 0.9.12cvs74.1.patchset
 ( cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/gtk/colorsel.c; ) > 0.9.12cvs74.2.patchset
+( cvs diff -u -r 1.14.2.10 -r 1.14.2.11 src/plugins/trayicon/trayicon.c; ) > 0.9.12cvs76.1.patchset

diff --git a/configure.ac b/configure.ac
index 86581a3d6d69aaaa2fc052a1de681c8e0cc54ea8..b8b46ea747be4e315b0fad42a45550e84ee898db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=74
+EXTRA_VERSION=76
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index d8618157a5d4d20ca5238054209473c09eedfe0b..c7add0aff50f3b7218ef9c57506e4d7074617efc 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -81,7 +81,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 _All"),               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},