2008-07-20 [ticho] 3.5.0cvs29
authorAndrej Kacian <ticho@claws-mail.org>
Sun, 20 Jul 2008 13:01:52 +0000 (13:01 +0000)
committerAndrej Kacian <ticho@claws-mail.org>
Sun, 20 Jul 2008 13:01:52 +0000 (13:01 +0000)
* src/folderview.c
* src/imap_gtk.c
* src/news_gtk.c
Moved sensitivity setting for "Download messages" for IMAP and
news folders from folderview.c to imap_gtk.c and news_gtk.c
respectively for better code readability.
Fixed indentation in news' set_sensitivity().

ChangeLog
PATCHSETS
configure.ac
src/folderview.c
src/imap_gtk.c
src/news_gtk.c

index 40e09cb..6399da5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-20 [ticho]     3.5.0cvs29
+
+       * src/folderview.c
+       * src/imap_gtk.c
+       * src/news_gtk.c
+               Moved sensitivity setting for "Download messages" for IMAP and
+               news folders from folderview.c to imap_gtk.c and news_gtk.c
+               respectively for better code readability.
+               Fixed indentation in news' set_sensitivity().
+
 2008-07-20 [paul]      3.5.0cvs28
 
        * src/addrgather.c
index 1cd2a30..178352d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/edittags.c;  cvs diff -u -r 1.115.2.199 -r 1.115.2.200 src/main.c;  cvs diff -u -r 1.83.2.134 -r 1.83.2.135 src/mimeview.c;  cvs diff -u -r 1.20.2.24 -r 1.20.2.25 src/mimeview.h;  cvs diff -u -r 1.5.2.75 -r 1.5.2.76 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.41 -r 1.4.2.42 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.28 -r 1.5.2.29 src/gtk/menu.c;  cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/gtk/menu.h;  ) > 3.5.0cvs26.patchset
 ( cvs diff -u -r 1.5.10.22 -r 1.5.10.23 src/addrgather.c;  cvs diff -u -r 1.274.2.254 -r 1.274.2.255 src/mainwindow.c;  cvs diff -u -r 1.39.2.48 -r 1.39.2.49 src/mainwindow.h;  ) > 3.5.0cvs27.patchset
 ( cvs diff -u -r 1.5.10.23 -r 1.5.10.24 src/addrgather.c;  ) > 3.5.0cvs28.patchset
+( cvs diff -u -r 1.207.2.202 -r 1.207.2.203 src/folderview.c;  cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/imap_gtk.c;  cvs diff -u -r 1.2.2.26 -r 1.2.2.27 src/news_gtk.c;  ) > 3.5.0cvs29.patchset
index f3e48d4..820374e 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 1cb9b1d..16bb6d3 100644 (file)
@@ -1958,9 +1958,6 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
 #define SET_SENS(name, sens) \
        menu_set_sensitive(fpopup_factory, name, sens)
 
-       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);
index 814adaf..973a644 100644 (file)
@@ -125,6 +125,7 @@ static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
        SET_SENS("/Check for new messages", folder_item_parent(item) == NULL);
        SET_SENS("/Check for new folders",  folder_item_parent(item) == NULL);
        SET_SENS("/Rebuild folder tree",    folder_item_parent(item) == NULL);
+       SET_SENS("/Download messages",      !item->no_select);
        
        SET_SENS("/Subscriptions/Unsubscribe...",    item->stype == F_NORMAL && folder_item_parent(item) != NULL);
        SET_SENS("/Subscriptions/Subscribe...",    TRUE);
index 51cd00d..6b200f2 100644 (file)
@@ -93,24 +93,29 @@ static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
        menu_set_sensitive(factory, name, sens)
 
        SET_SENS("/Subscribe to newsgroup...", 
-                folder_item_parent(item) == NULL 
-                && mainwin->lock_count == 0
-                && news_folder_locked(item->folder) == 0);
+                       folder_item_parent(item) == NULL 
+                       && mainwin->lock_count == 0
+                       && news_folder_locked(item->folder) == 0);
        SET_SENS("/Unsubscribe newsgroup",     
-                folder_item_parent(item) != NULL 
-                && mainwin->lock_count == 0
-                && news_folder_locked(item->folder) == 0);
+                       folder_item_parent(item) != NULL 
+                       && mainwin->lock_count == 0
+                       && news_folder_locked(item->folder) == 0);
        SET_SENS("/Check for new messages",    
-                folder_item_parent(item) == NULL 
-                && mainwin->lock_count == 0
-                && news_folder_locked(item->folder) == 0);
+                       folder_item_parent(item) == NULL 
+                       && mainwin->lock_count == 0
+                       && news_folder_locked(item->folder) == 0);
        SET_SENS("/Synchronise",    
-                item ? (folder_item_parent(item) != NULL && folder_want_synchronise(item->folder))
-                        : FALSE);
-       SET_SENS("/Rename folder...", 
-                folder_item_parent(item) != NULL 
-                && mainwin->lock_count == 0
-                && news_folder_locked(item->folder) == 0);
+                       item ? (folder_item_parent(item) != NULL
+                       && folder_want_synchronise(item->folder))
+                       : FALSE);
+       SET_SENS("/Download messages",
+                       item ? (folder_item_parent(item) != NULL
+                       && !item->no_select)
+                       : FALSE);
+       SET_SENS("/Rename folder...",
+                       folder_item_parent(item) != NULL 
+                       && mainwin->lock_count == 0
+                       && news_folder_locked(item->folder) == 0);
 #undef SET_SENS
 }