2005-09-14 [paul] 1.9.14cvs29
authorPaul Mangan <paul@claws-mail.org>
Wed, 14 Sep 2005 11:31:01 +0000 (11:31 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 14 Sep 2005 11:31:01 +0000 (11:31 +0000)
* src/prefs_account.c
disable 'Filter messages on receiving' for
SMTP-only accounts
Patch  by Anders Hammar

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/prefs_account.c

index f7f68423026ea2e4410562a00a6d440fd170b989..9b67c0e7ed8970ba97525ff4d4fe1ae2785c119b 100644 (file)
@@ -1,3 +1,10 @@
+2005-09-14 [paul]      1.9.14cvs29
+
+       * src/prefs_account.c
+               disable 'Filter messages on receiving' for
+               SMTP-only accounts
+               Patch  by Anders Hammar
+
 2005-09-14 [paul]      1.9.14cvs28
 
        * po/sk.po
index 3968de9d6691f87877cd2a69289d0e4ee4b1f218..2bf97e708c740e452511b0b8047e4c47d13312d4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.15.2.4 -r 1.15.2.5 src/addrcache.c;  cvs diff -u -r 1.15.2.9 -r 1.15.2.10 src/codeconv.h;  cvs diff -u -r 1.87.2.17 -r 1.87.2.18 src/folder.h;  cvs diff -u -r 1.39.2.6 -r 1.39.2.7 src/mainwindow.h;  cvs diff -u -r 1.79.2.17 -r 1.79.2.18 src/mh.c;  cvs diff -u -r 1.20.2.3 -r 1.20.2.4 src/mimeview.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/partial_download.c;  cvs diff -u -r 1.56.2.38 -r 1.56.2.39 src/pop.c;  cvs diff -u -r 1.105.2.32 -r 1.105.2.33 src/prefs_account.c;  cvs diff -u -r 1.49.2.13 -r 1.49.2.14 src/prefs_account.h;  cvs diff -u -r 1.60.2.20 -r 1.60.2.21 src/prefs_actions.c;  cvs diff -u -r 1.16.2.12 -r 1.16.2.13 src/prefs_customheader.c;  cvs diff -u -r 1.16.2.12 -r 1.16.2.13 src/prefs_display_header.c;  cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.21 -r 1.43.2.22 src/prefs_matcher.c;  cvs diff -u -r 1.30.2.15 -r 1.30.2.16 src/prefs_toolbar.c;  cvs diff -u -r 1.10.2.3 -r 1.10.2.4 src/privacy.h;  cvs diff -u -r 1.49.2.59 -r 1.49.2.60 src/procmime.c;  cvs diff -u -r 1.17.2.10 -r 1.17.2.11 src/procmime.h;  cvs diff -u -r 1.60.2.16 -r 1.60.2.17 src/procmsg.h;  cvs diff -u -r 1.96.2.74 -r 1.96.2.75 src/textview.c;  cvs diff -u -r 1.5.14.1 -r 1.5.14.2 src/undo.h;  cvs diff -u -r 1.13.2.6 -r 1.13.2.7 src/common/plugin.c;  cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/common/session.h;  cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/common/socket.c;  cvs diff -u -r 1.13.2.2 -r 1.13.2.3 src/common/socket.h;  cvs diff -u -r 1.2.4.12 -r 1.2.4.13 src/common/template.c;  cvs diff -u -r 1.9.2.23 -r 1.9.2.24 src/gtk/gtkaspell.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/quicksearch.h;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpcore/prefs_gpg.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/select-keys.h;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.14.2.18 -r 1.14.2.19 src/plugins/trayicon/trayicon.c;  ) > 1.9.14cvs26.patchset
 ( cvs diff -u -r 1.60.2.13 -r 1.60.2.14 po/es.po;  cvs diff -u -r 1.382.2.168 -r 1.382.2.169 src/compose.c;  cvs diff -u -r 1.50.2.10 -r 1.50.2.11 src/compose.h;  cvs diff -u -r 1.28.2.7 -r 1.28.2.8 src/mbox.c;  cvs diff -u -r 1.96.2.75 -r 1.96.2.76 src/textview.c;  ) > 1.9.14cvs27.patchset
 ( cvs diff -u -r 1.2.2.14 -r 1.2.2.15 po/sk.po;  ) > 1.9.14cvs28.patchset
+( cvs diff -u -r 1.105.2.33 -r 1.105.2.34 src/prefs_account.c;  ) > 1.9.14cvs29.patchset
index 1b6c8f52e5da36e7c2606e8d227a2899bbb4a0cb..9afd0a0e941e7627a873babb252328a994739102 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index de3ddb305863549808135903cfa6cc2f4fff74b9..c7b98476794962c88c89d111dbe3082c1b83574d 100644 (file)
@@ -2732,6 +2732,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(receive.pop3_frame);
                gtk_widget_hide(receive.imap_frame);
                gtk_widget_show(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
                /* update pop_before_smtp sensitivity */
                gtk_toggle_button_set_active
@@ -2740,6 +2741,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
                
                if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), 
+                               TRUE);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
                                 FALSE);
@@ -2806,6 +2810,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(receive.pop3_frame);
                gtk_widget_hide(receive.imap_frame);
                gtk_widget_hide(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
                prefs_account_mailcmd_toggled
                        (GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn), NULL);
@@ -2817,6 +2822,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
 
                if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), 
+                               TRUE);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
                                 TRUE);
@@ -2886,6 +2894,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(receive.pop3_frame);
                gtk_widget_show(receive.imap_frame);
                gtk_widget_hide(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
                gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
@@ -2897,6 +2906,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_set_sensitive(p_send.pop_bfr_smtp_tm_entry, FALSE);
 
                if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), 
+                               TRUE);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
                                 FALSE);
@@ -2967,6 +2979,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_hide(receive.pop3_frame);
                gtk_widget_hide(receive.imap_frame);
                gtk_widget_hide(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, FALSE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, FALSE);
 
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
@@ -2975,7 +2988,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                /* update pop_before_smtp sensitivity */
                gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
                pop_bfr_smtp_tm_set_sens(NULL, NULL);
-               
+       
+               gtk_toggle_button_set_active
+                       (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), FALSE);
                gtk_toggle_button_set_active
                        (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), FALSE);
 
@@ -3045,6 +3060,7 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_show(receive.pop3_frame);
                gtk_widget_hide(receive.imap_frame);
                gtk_widget_hide(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.filter_on_recv_chkbtn, TRUE);
                gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, TRUE);
 
                gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
@@ -3055,6 +3071,9 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                pop_bfr_smtp_tm_set_sens(NULL, NULL);
                
                if (!tmp_ac_prefs.account_name) {
+                       gtk_toggle_button_set_active
+                               (GTK_TOGGLE_BUTTON(receive.filter_on_recv_chkbtn), 
+                               TRUE);
                        gtk_toggle_button_set_active
                                (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn),
                                 TRUE);