2008-12-05 [paul] 3.6.1cvs60

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

diff --git a/ChangeLog b/ChangeLog
index 67e7520af23e8b3681d4c3b3493e384ccf148c01..cf846310e0b3d6637c0e2a6e8bfce386b8453c47 100644 (file)
--- 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
index d48f801959a1a206e895f560f32b217649edd031..1d508aee1bbf98f91493fc2ca934e1a2e6b1e4a1 100644 (file)
--- 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
index 6564ed1bf4ccb2c69ff719ed624b429376f10253..b1bbe5f0c43e953cb8f21920f54f76ca15de6191 100644 (file)
--- 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
index 4169f979003b4c81a6e2e44ed268cb66ca7d49ce..ede5904af15fc62056ff61979059e53f3f8009cc 100644 (file)
--- 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;