2007-08-24 [wwp] 2.10.0cvs159

	* src/folderview.c
		Update menu item sensitivity if necessary (or we get a
		gtk critical message).

diff --git a/ChangeLog b/ChangeLog
index f7494d2b9a9bacdff0e30dff68138c6445e8d5ef..14cb4d41e19f1439367a5fccdfc96dc024e2f062 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-24 [wwp]       2.10.0cvs159
+
+       * src/folderview.c
+               Update menu item sensitivity if necessary (or we get a
+               gtk critical message).
+
 2007-08-23 [wwp]       2.10.0cvs158
 
        * src/action.c

diff --git a/PATCHSETS b/PATCHSETS
index 2b82a3a848c81c4e5a172b51f947a75a7484ee9b..a8ae693c4bdbbd03765877a5cf043bab9963ff12 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2813,3 +2813,4 @@
 ( cvs diff -u -r 1.179.2.185 -r 1.179.2.186 src/imap.c;  ) > 2.10.0cvs156.patchset
 ( cvs diff -u -r 1.60.2.95 -r 1.60.2.96 src/addressbook.c;  ) > 2.10.0cvs157.patchset
 ( cvs diff -u -r 1.12.2.47 -r 1.12.2.48 src/action.c;  cvs diff -u -r 1.60.2.47 -r 1.60.2.48 src/prefs_actions.c;  ) > 2.10.0cvs158.patchset
+( cvs diff -u -r 1.207.2.176 -r 1.207.2.177 src/folderview.c;  ) > 2.10.0cvs159.patchset

diff --git a/configure.ac b/configure.ac
index bfb33fed48b2905926b3139083b565c53e413a61..00ff9db92c73acfefc4b80b17be251c2f2ff0018 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=158
+EXTRA_VERSION=159
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 555b4f5a3a81f61ad3f25797c75805ae47e1585b..6a1b6506afb142dbed0591a5e1ef23fff1b63812 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1925,7 +1925,8 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
 #define SET_SENS(name, sens) \
        menu_set_sensitive(fpopup_factory, name, sens)
 
-       SET_SENS("/Download messages", !item->no_select);
+       if ( FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_TYPE(item->folder) == F_IMAP )
+               SET_SENS("/Download messages", !item->no_select);
        SET_SENS("/Mark all read", item->unread_msgs >= 1);
        SET_SENS("/Search folder...", item->total_msgs >= 1 && 
                 folderview->selected == folderview->opened);
@@ -1950,8 +1951,6 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
        popup = gtk_item_factory_get_widget(fpopup_factory, fpopup->path);
        gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL,
                       event->button, event->time);
-
-
 }
 
 static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,