2006-01-19 [colin] 1.9.100cvs169

	* src/plugins/trayicon/trayicon.c
		Gray out Get Mail when already getting mail

diff --git a/ChangeLog b/ChangeLog
index 8557c6b0dc93f8b7b14c851e51288e43df736554..de5ec3a9a45f07d3916ce3a0beea36d8829a64a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-19 [colin]     1.9.100cvs169
+
+       * src/plugins/trayicon/trayicon.c
+               Gray out Get Mail when already getting mail
+
 2006-01-18 [paul]      1.9.100cvs168
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 92525358f9243f56b3dce633e0a68dfaa05f3aab..b5c88975e71b518d39a7b184fc8cbffbcd19993a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1152,3 +1152,4 @@
 ( cvs diff -u -r 1.3.2.5 -r 1.3.2.6 tools/kdeservicemenu/template_sylpheed-attach-files.desktop;  cvs diff -u -r 1.3.2.5 -r 1.3.2.6 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop;  ) > 1.9.100cvs166.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 doc/man/sylpheed-claws.1;  ) > 1.9.100cvs167.patchset
 ( cvs diff -u -r 1.382.2.226 -r 1.382.2.227 src/compose.c;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/gtk/quicksearch.c;  ) > 1.9.100cvs168.patchset
+( cvs diff -u -r 1.14.2.32 -r 1.14.2.33 src/plugins/trayicon/trayicon.c;  ) > 1.9.100cvs169.patchset

diff --git a/configure.ac b/configure.ac
index 2a62fdb56b98e87af12ded9a39742f18dbd50c40..48d2d083966887d0264b5cba70a6d1f7dc05d87c 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=168
+EXTRA_VERSION=169
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index 65137e94eb8a6bd7b851e3fc0c40b83d771618af..9e6e45c5b8bdadcb9401c76bd4316ab08fccbcae 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -202,6 +202,9 @@ static gboolean click_cb(GtkWidget * widget,
                gtk_check_menu_item_set_active(
                        GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item(traymenu_factory,
                        _("/Work Offline"))), prefs_common.work_offline);
+               gtk_widget_set_sensitive(
+                       GTK_WIDGET(gtk_item_factory_get_item(traymenu_factory,
+                       _("/Get Mail"))), mainwin->lock_count == 0);
                updating_menu = FALSE;
 
                gtk_menu_popup( GTK_MENU(traymenu_popup), NULL, NULL, NULL, NULL,