0.9.7claws31

* src/folder_item_prefs.[ch]
* src/folderview.c
* src/prefs_folder_item.c
        add new FolderItem property to exclude folders from new
        mail checks

Patch submitted by Chad Robinson <crobinson@rfgonline.com>

diff --git a/AUTHORS b/AUTHORS
index cf76d10ce8810c07fe9b07a0c7926ff15821b5c8..8be22e385fb4fd7c52f396389dc3d6afdf82cb1a 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -199,3 +199,4 @@ contributors (beside the above; based on Changelog)
        David Relson
        Matthias Förste
        David Chalmers
+       Chad Robinson

diff --git a/ChangeLog.claws b/ChangeLog.claws
index bc7d016882bcab43357835fe3d5e14a327dc69d2..b680919873a0f808b6cecef6a3574fe4bba637b5 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2003-12-08 [christoph] 0.9.7claws31
+
+       * src/folder_item_prefs.[ch]
+       * src/folderview.c
+       * src/prefs_folder_item.c
+               add new FolderItem property to exclude folders from new
+               mail checks
+
+       Patch submitted by Chad Robinson <crobinson@rfgonline.com>
+
 2003-12-07 [paul]      0.9.7claws30
 
        * src/plugins/clamav/clamav_plugin.c
@@ -21,7 +31,7 @@
                leaving claws' online/offline more or less intact
                see ChangeLog 2003-12-04 and 2003-12-06
 
-2003-12-05 [christoph] 0.9.7claws26
+2003-12-06 [christoph] 0.9.7claws26
 
        * src/messageview.c
        * src/privacy.[ch]

diff --git a/configure.ac b/configure.ac
index eed29093ddb5f01101e09575e23df97694413b10..786ad019b98a0bd6e576cbb07442e4c3dd08faa0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index a0de0de772a5d51f9a7c02d61b8ee2511de05d07..db34f5955dfe40c842c673d8caa7cf8b35951b3d 100644 (file)
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -93,6 +93,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"enable_processing", "TRUE", &tmp_prefs.enable_processing, P_BOOL,
         NULL, NULL, NULL},
+       {"newmailcheck", "TRUE", &tmp_prefs.newmailcheck, P_BOOL,
+        NULL, NULL, NULL},
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
 
@@ -186,6 +188,9 @@ static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
 
         prefs->enable_processing = TRUE;
        prefs->processing = NULL;
+
+       prefs->newmailcheck = TRUE;
+
        return prefs;
 }
 
@@ -239,6 +244,7 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
        tmp_prefs.sort_descending               = src->prefs->sort_descending;
        tmp_prefs.enable_thread                 = src->prefs->enable_thread;
         tmp_prefs.enable_processing             = src->prefs->enable_processing;
+    tmp_prefs.newmailcheck             = src->prefs->newmailcheck;
 
        prefs_matcher_read_config();
 

diff --git a/src/folder_item_prefs.h b/src/folder_item_prefs.h
index 8fe11177ab81430f3eea1a3c7420f47208e7ad37..9fda358fbe58aca0ec8ac70982cf132bc3a7ecfb 100644 (file)
--- a/src/folder_item_prefs.h
+++ b/src/folder_item_prefs.h
@@ -44,6 +44,8 @@ struct _FolderItemPrefs {
         int enable_processing;
        GSList * processing;
 
+       int newmailcheck;
+
        gboolean request_return_receipt;
        gboolean enable_default_to;
        gchar *default_to;

diff --git a/src/folderview.c b/src/folderview.c
index 347442374ddd95be94e30d41bf1810177a0dfcea..06c5a0272f2cf38278a40a697c5bb1ef7d3d71e1 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -876,6 +876,7 @@ gint folderview_check_new(Folder *folder)
                        if (item->no_select) continue;
                        if (folder && folder != item->folder) continue;
                        if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
+                       if (!item->prefs->newmailcheck) continue;
 
                        folderview_scan_tree_func(item->folder, item, NULL);
                        former_new = item->new_msgs;

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 3a627e87f5d628be66d7f4c10160b958d455bf86..7d02fc09fdfa3e9cebe89ee26f9ced623169f7a5 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -66,6 +66,7 @@ struct FolderItemGeneralPage
        GtkWidget *entry_folder_chmod;
        GtkWidget *folder_color_btn;
        GtkWidget *checkbtn_enable_processing;
+       GtkWidget *checkbtn_newmailcheck;
 
        gint       folder_color;
 };
@@ -118,6 +119,7 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        GtkWidget *folder_color;
        GtkWidget *folder_color_btn;
        GtkWidget *checkbtn_enable_processing;
+       GtkWidget *checkbtn_newmailcheck;
 
        page->item         = item;
 
@@ -168,7 +170,7 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        }
        
        rowcount++;
-
+       
        /* Folder color */
        folder_color = gtk_label_new(_("Folder color: "));
        gtk_misc_set_alignment(GTK_MISC(folder_color), 0, 0.5);
@@ -206,6 +208,17 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
 
        rowcount++;
 
+       /* Check folder for new mail */
+       checkbtn_newmailcheck = gtk_check_button_new_with_label(_("Scan for new mail: "));
+       gtk_widget_show(checkbtn_newmailcheck);
+       gtk_table_attach(GTK_TABLE(table), checkbtn_newmailcheck, 0, 2,
+                                        rowcount, rowcount+1, GTK_SHRINK | GTK_FILL, GTK_FILL, 0, 0);
+       
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_newmailcheck),
+                                                                item->prefs->newmailcheck);
+       
+       rowcount++;
+
        page->table = table;
        page->checkbtn_simplify_subject = checkbtn_simplify_subject;
        page->entry_simplify_subject = entry_simplify_subject;
@@ -213,6 +226,7 @@ void prefs_folder_item_general_create_widget_func(PrefsPage * page_,
        page->entry_folder_chmod = entry_folder_chmod;
        page->folder_color_btn = folder_color_btn;
        page->checkbtn_enable_processing = checkbtn_enable_processing;
+       page->checkbtn_newmailcheck = checkbtn_newmailcheck;
 
        page->page.widget = table;
 }
@@ -259,6 +273,9 @@ void prefs_folder_item_general_save_func(PrefsPage *page_)
        prefs->enable_processing = 
            gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_enable_processing));
 
+       prefs->newmailcheck = 
+           gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_newmailcheck));
+
        folder_item_prefs_save_config(page->item);
 }