2007-02-07 [paul] 2.7.2cvs29

	* src/folder.c
		cut down on unnecessary debug_prints
	* src/imap_gtk.c
		fix menu_set_active() on 'Show only
		subscribed folders'

diff --git a/ChangeLog b/ChangeLog
index 3f31952e49f689090609277de1ff1f733be32ea3..f8a2b9f0405458ac0ede130f569831ac78f9e045 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-07 [paul]      2.7.2cvs29
+
+       * src/folder.c
+               cut down on unnecessary debug_prints
+       * src/imap_gtk.c
+               fix menu_set_active() on 'Show only
+               subscribed folders'
+
 2007-02-07 [paul]      2.7.2cvs28
 
        * src/plugins/clamav/clamav_plugin.c

diff --git a/PATCHSETS b/PATCHSETS
index 6baa9d2c35845bd856fcef0cc5691b8479d24721..357f9d12178818b3db7c3bba2ab38dc05e8b6946 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2346,3 +2346,4 @@
 ( cvs diff -u -r 1.395.2.282 -r 1.395.2.283 src/summaryview.c;  ) > 2.7.2cvs26.patchset
 ( cvs diff -u -r 1.47.2.38 -r 1.47.2.39 src/procheader.c;  ) > 2.7.2cvs27.patchset
 ( cvs diff -u -r 1.13.2.29 -r 1.13.2.30 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/plugins/clamav/clamav_plugin.h;  cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/plugins/clamav/clamav_plugin_gtk.c;  ) > 2.7.2cvs28.patchset
+( cvs diff -u -r 1.213.2.134 -r 1.213.2.135 src/folder.c;  cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/imap_gtk.c;  ) > 2.7.2cvs29.patchset

diff --git a/configure.ac b/configure.ac
index f649a9715b3ae5cf35e621d25718e55057fee22b..645a400dc840672eb15a117370f4a5898c74f702 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index df78ee30ed150da35b5652f834b365680ae987f5..09d9fcb732ff3b8c81a490eb71e22940c07d965e 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -3987,7 +3987,8 @@ gboolean folder_want_synchronise(Folder *folder)
        folder_func_to_all_folders(folder_item_want_synchronise_func, want_sync_data);
        result = want_sync_data->want_sync;
        g_free(want_sync_data);
-       debug_print("Folder %s wants sync: %d\n", folder->name, result);
+       if (result > 0)
+               debug_print("Folder %s wants sync\n", folder->name);
        return result;
 }
 

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index c80a4ef31424d8aecce2352c53d1f7ce9ee10c8a..58d9991e201e77d5f89d5044373a9b0d1f6852fb 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -127,7 +127,7 @@ static void set_sensitivity(GtkItemFactory *factory, FolderItem *item)
        
        SET_SENS("/Subscriptions/Unsubscribe...",    item->stype == F_NORMAL && folder_item_parent(item) != NULL);
        SET_SENS("/Subscriptions/Subscribe...",    TRUE);
-       menu_set_active(factory, "/Subscriptions/Show subscribed folders only", item->folder->account->imap_subsonly);
+       menu_set_active(factory, "/Subscriptions/Show only subscribed folders", item->folder->account->imap_subsonly);
 
 #undef SET_SENS
 }