2006-10-04 [wwp] 2.5.3cvs3

	* src/prefs_folder_item.c
		Kill the clandestine passengers. You didn't see anything.

diff --git a/ChangeLog b/ChangeLog
index c82649fe81998d42cf02b86b0dba402c58c2473f..e34dd61d996099e41a884ca7ac9ef4281ae00f1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-04 [wwp]       2.5.3cvs3
+
+       * src/prefs_folder_item.c
+               Kill the clandestine passengers. You didn't see anything.
+

 2006-10-04 [wwp]       2.5.3cvs2
 
        * src/prefs_folder_item.c
 2006-10-04 [wwp]       2.5.3cvs2
 
        * src/prefs_folder_item.c

diff --git a/PATCHSETS b/PATCHSETS
index de599474390a5de882b83192a581e887b58ae6db..5fdd64e9a0d901ba0aa736f89cdcabef94d477f9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1957,3 +1957,4 @@
 ( cvs diff -u -r 1.79.2.48 -r 1.79.2.49 src/mh.c;  ) > 2.5.2cvs41.patchset
 ( cvs diff -u -r 1.213.2.120 -r 1.213.2.121 src/folder.c;  cvs diff -u -r 1.87.2.30 -r 1.87.2.31 src/folder.h;  cvs diff -u -r 1.395.2.261 -r 1.395.2.262 src/summaryview.c;  ) > 2.5.2cvs42.patchset
 ( cvs diff -u -r 1.52.2.24 -r 1.52.2.25 src/prefs_folder_item.c;  ) > 2.5.3cvs2.patchset
 ( cvs diff -u -r 1.79.2.48 -r 1.79.2.49 src/mh.c;  ) > 2.5.2cvs41.patchset
 ( cvs diff -u -r 1.213.2.120 -r 1.213.2.121 src/folder.c;  cvs diff -u -r 1.87.2.30 -r 1.87.2.31 src/folder.h;  cvs diff -u -r 1.395.2.261 -r 1.395.2.262 src/summaryview.c;  ) > 2.5.2cvs42.patchset
 ( cvs diff -u -r 1.52.2.24 -r 1.52.2.25 src/prefs_folder_item.c;  ) > 2.5.3cvs2.patchset

+( cvs diff -u -r 1.52.2.25 -r 1.52.2.26 src/prefs_folder_item.c;  ) > 2.5.3cvs3.patchset

diff --git a/configure.ac b/configure.ac
index d6fdaffbd75a246d7678da8adc833c4aca455f09..89de71bf3ebc7e1d2138c86d6222a912d47b3e72 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=2
+EXTRA_VERSION=3

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 2cedcbd99ac194bbaf3360d03a647a3a31bf867e..5354525b18ff12fe00553c67f9b4533d8450ec8b 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -110,7 +110,6 @@ struct _FolderItemComposePage
        GtkWidget *checkbtn_enable_default_dictionary;
        GtkWidget *optmenu_default_dictionary;
 #endif
        GtkWidget *checkbtn_enable_default_dictionary;
        GtkWidget *optmenu_default_dictionary;
 #endif

-       GtkWidget *checkbtn_do_not_sign_or_encrypt;

 
        /* apply to sub folders */
        GtkWidget *request_return_receipt_rec_checkbtn;
 
        /* apply to sub folders */
        GtkWidget *request_return_receipt_rec_checkbtn;


@@ -121,8 +120,6 @@ struct _FolderItemComposePage
 #if USE_ASPELL
        GtkWidget *default_dictionary_rec_checkbtn;
 #endif
 #if USE_ASPELL
        GtkWidget *default_dictionary_rec_checkbtn;
 #endif

-       GtkWidget *do_not_sign_or_encrypt_rec_checkbtn;
-

 };
 
 
 };