Remove 'search folder' item from popup menu when no mail in folder

diff --git a/ChangeLog.claws b/ChangeLog.claws
index eea2cea4103b1b432b2756e89bf517eaba4b7b12..7e57a9b349ecac1bfbb1416f99d8a0127f05df3d 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-01-19 [keith]     0.9.8claws34
+       * src/folderview.c
+               don't show 'Search folder...' on popup menu
+               if folder has no mails in it
+
 2004-01-17 [keith]     0.9.8claws33
        * src/compose.c
          src/prefs_common.c

diff --git a/configure.ac b/configure.ac
index 687bd3e87f98b250c2bb9d584b1fb6262a4f4cff..9afa68c99baa69fde2e57bb6adf5a63c0fb38c58 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
@@ -60,7 +60,7 @@ AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
 dnl Specify a header configuration file
-AC_CONFIG_HEADERS(config.h)
+AM_CONFIG_HEADER(config.h)
 
 AM_MAINTAINER_MODE
 

diff --git a/src/folderview.c b/src/folderview.c
index 061a2024f950b8bba381dcc7c013cc9ee30c36ed..f9f368e813875f70e0f8ee93b9886a1a01c44c9f 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1509,6 +1509,8 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                                folder_processing = TRUE;
                        else if (item->stype == F_OUTBOX)
                                folder_processing = TRUE;
+                       if (0 == item->total_msgs)
+                               search_folder = FALSE;
                } else if (FOLDER_TYPE(folder) == F_NEWS) {
                        if (folder_item_parent(item) != NULL)
                                delete_folder = folder_scoring = folder_processing = TRUE;