talons

commit 5e3b34eb0ffd033069a1932a6a9ad39aa864b503
parent 022540892042ca15e8c4c9a69111e1d2a5ed6113
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 31 Mar 2009 06:41:45 +0000

2009-03-31 [colin]	3.7.1cvs31

	* src/prefs_account.c
		Don't use un-sensitive checkboxes in Privacy tab
		when privacy system in None (makes unchecking
		painful when no privacy plugin is loaded)

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_account.c
 | 
14
++------------

4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-31 [colin]	3.7.1cvs31
+
+	* src/prefs_account.c
+		Don't use un-sensitive checkboxes in Privacy tab
+		when privacy system in None (makes unchecking 
+		painful when no privacy plugin is loaded)
+
 2009-03-30 [colin]	3.7.1cvs30
 
 	* src/folder.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3770,3 +3770,4 @@
 ( cvs diff -u -r 1.213.2.191 -r 1.213.2.192 src/folder.c;  ) > 3.7.1cvs28.patchset
 ( cvs diff -u -r 1.179.2.245 -r 1.179.2.246 src/imap.c;  ) > 3.7.1cvs29.patchset
 ( cvs diff -u -r 1.213.2.192 -r 1.213.2.193 src/folder.c;  cvs diff -u -r 1.87.2.59 -r 1.87.2.60 src/folder.h;  cvs diff -u -r 1.179.2.246 -r 1.179.2.247 src/imap.c;  cvs diff -u -r 1.274.2.300 -r 1.274.2.301 src/mainwindow.c;  cvs diff -u -r 1.39.2.55 -r 1.39.2.56 src/mainwindow.h;  cvs diff -u -r 1.105.2.151 -r 1.105.2.152 src/prefs_account.c;  cvs diff -u -r 1.49.2.42 -r 1.49.2.43 src/prefs_account.h;  cvs diff -u -r 1.395.2.409 -r 1.395.2.410 src/summaryview.c;  cvs diff -u -r 1.68.2.51 -r 1.68.2.52 src/summaryview.h;  ) > 3.7.1cvs30.patchset
+( cvs diff -u -r 1.105.2.152 -r 1.105.2.153 src/prefs_account.c;  ) > 3.7.1cvs31.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -896,19 +896,9 @@ static void privacy_system_activated(GtkWidget *combobox)
 	if( privacy_enabled_int == 0 )
 		privacy_enabled = FALSE;
 
-	gtk_widget_set_sensitive (privacy_page.default_encrypt_checkbtn,
-			privacy_enabled);
-	gtk_widget_set_sensitive (privacy_page.default_encrypt_reply_checkbtn,
-			privacy_enabled);
-	gtk_widget_set_sensitive (privacy_page.default_sign_checkbtn,
-			privacy_enabled);
-	gtk_widget_set_sensitive (privacy_page.default_sign_reply_checkbtn,
-			privacy_enabled);
-	gtk_widget_set_sensitive (privacy_page.encrypt_to_self_checkbtn,
-			privacy_enabled);
 	gtk_widget_set_sensitive (privacy_page.save_clear_text_checkbtn, 
-		privacy_enabled && !gtk_toggle_button_get_active(
-					GTK_TOGGLE_BUTTON(privacy_page.encrypt_to_self_checkbtn)));
+		!gtk_toggle_button_get_active(
+				GTK_TOGGLE_BUTTON(privacy_page.encrypt_to_self_checkbtn)));
 }
 
 /* Populate the privacy system choice combobox with valid choices */