2005-10-04 [colin] 1.9.15cvs8

	* src/plugins/trayicon/trayicon.c
		Relabel "Offline" to "Work offline"

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index c248ccd046c08bac8989016046f27157d409a9af..504852aad84792ed3ae8fa9f87c779adc4f5f404 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-10-04 [colin]     1.9.15cvs8
+
+       * src/plugins/trayicon/trayicon.c
+               Relabel "Offline" to "Work offline"
+

 2005-10-04 [colin]     1.9.15cvs7
 
        * src/export.c
 2005-10-04 [colin]     1.9.15cvs7
 
        * src/export.c

diff --git a/PATCHSETS b/PATCHSETS
index b7b4db9660c8c2c5fa90a086ae208c4aedb60e8d..570ded64950a356807748fb4be6a578551cfdc52 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -844,3 +844,4 @@
 ( cvs diff -u -r 1.213.2.58 -r 1.213.2.59 src/folder.c;  ) > 1.9.15cvs5.patchset
 ( cvs diff -u -r 1.213.2.59 -r 1.213.2.60 src/folder.c;  cvs diff -u -r 1.207.2.65 -r 1.207.2.66 src/folderview.c;  cvs diff -u -r 1.395.2.129 -r 1.395.2.130 src/summaryview.c;  ) > 1.9.15cvs6.patchset
 ( 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.213.2.58 -r 1.213.2.59 src/folder.c;  ) > 1.9.15cvs5.patchset
 ( cvs diff -u -r 1.213.2.59 -r 1.213.2.60 src/folder.c;  cvs diff -u -r 1.207.2.65 -r 1.207.2.66 src/folderview.c;  cvs diff -u -r 1.395.2.129 -r 1.395.2.130 src/summaryview.c;  ) > 1.9.15cvs6.patchset
 ( 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

diff --git a/configure.ac b/configure.ac
index cd6dc2025c84cf6a0f0c7bd121598aba5e6424c6..6a6d494c55b12fb8df090ca6a825b152b10dfbc6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=7
+EXTRA_VERSION=8

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index ad3b240fec60ff209b6160f6c39f3197971cc835..d8eee2b8a1c791a1b64fea400a433486492b2ce6 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -91,15 +91,15 @@ static void resize_cb                   (GtkWidget *widget, GtkRequisition *req, gpointer use
 
 static GtkItemFactoryEntry trayicon_popup_menu_entries[] =
 {
 
 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_("/---"),                            NULL, NULL,                                                     0, "<Separator>"},
-       {N_("/_Email"),                         NULL, trayicon_compose_cb,                      0, NULL},
+       {N_("/_Get"),                   NULL, trayicon_get_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},
        {N_("/Open A_ddressbook"),      NULL, trayicon_addressbook_cb,          0, NULL},

-       {N_("/---"),                            NULL, NULL,                                                     0, "<Separator>"},
-       {N_("/_Offline"),                       NULL, trayicon_toggle_offline_cb,       0, "<CheckItem>"},
-       {N_("/---"),                            NULL, NULL,                                                     0, "<Separator>"},
-       {N_("/E_xit Sylpheed"),         NULL, trayicon_exit_cb,                         0, NULL}
+       {N_("/---"),                    NULL, NULL,                             0, "<Separator>"},
+       {N_("/_Work Offline"),          NULL, trayicon_toggle_offline_cb,       0, "<CheckItem>"},
+       {N_("/---"),                    NULL, NULL,                             0, "<Separator>"},
+       {N_("/E_xit Sylpheed"),         NULL, trayicon_exit_cb,                 0, NULL}

 };
 
 static void set_trayicon_pixmap(TrayIconType icontype)
 };
 
 static void set_trayicon_pixmap(TrayIconType icontype)