talons

commit 94fe4e29d1ff3c324657af933f6dbd82e858d8e7
parent e06e674b0931a7d9245c2472051b4d7ba88fc610
Author: Paul Mangan <paul@claws-mail.org>
Date:   Fri,  5 Dec 2008 09:11:24 +0000

2008-12-05 [paul]	3.6.1cvs60

	* src/prefs_common.h
		remove gpg prefs that are no longer needed here

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_common.h
 | 
10
----------

4 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-05 [paul]	3.6.1cvs60
+
+	* src/prefs_common.h
+		remove gpg prefs that are no longer needed here
+
 2008-12-03 [colin]	3.6.1cvs59
 
 	* src/msgcache.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3641,3 +3641,4 @@
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmclist.c;  ) > 3.6.1cvs57.patchset
 ( cvs diff -u -r 1.654.2.3704 -r 1.654.2.3705 configure.ac;  ) > 3.6.1cvs58.patchset
 ( cvs diff -u -r 1.16.2.62 -r 1.16.2.63 src/msgcache.c;  cvs diff -u -r 1.395.2.401 -r 1.395.2.402 src/summaryview.c;  cvs diff -u -r 1.1.4.51 -r 1.1.4.52 src/gtk/gtksctree.c;  ) > 3.6.1cvs59.patchset
+( cvs diff -u -r 1.103.2.118 -r 1.103.2.119 src/prefs_common.h;  ) > 3.6.1cvs60.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=59
+EXTRA_VERSION=60
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_common.h b/src/prefs_common.h
@@ -332,16 +332,6 @@ struct _PrefsCommon
 
 	GList *mime_open_cmd_history;
 
-#if USE_GPGME
-	/* Privacy */
-	gboolean auto_check_signatures;
-	gboolean gpg_signature_popup;
-	gboolean store_passphrase;
-	gint store_passphrase_timeout;
-	gboolean passphrase_grab;
-	gboolean gpg_warning;
-#endif /* USE_GPGME */
-
 	/* Addressbook */
 	gboolean addressbook_use_editaddress_dialog;
 	gint addressbook_hpaned_pos;