2006-06-21 [paul] 2.3.1cvs9

	* src/account.c
	* src/compose.c
	* src/prefs_account.c
	* src/prefs_account.h
		remove option to add date header - always
		add date header
	* src/etpan/imap-thread.c
		fix warnings (Thanks to Colin)

diff --git a/ChangeLog b/ChangeLog
index c73aba48998b85b0ae1b6191ed06e03629369f04..5db652e0abb0d557738eae4c9a4ab8cb3843f715 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-21 [paul]      2.3.1cvs9
+
+       * src/account.c
+       * src/compose.c
+       * src/prefs_account.c
+       * src/prefs_account.h
+               remove option to add date header - always
+               add date header
+       * src/etpan/imap-thread.c
+               fix warnings (Thanks to Colin)
+
 2006-06-21 [wwp]       2.3.1cvs8
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 6d50bc9dc442ffe569569f1f4ef77bcf71bab75b..67346ff18f21ba3ce0a3da6ab76a8bc1066ed794 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1609,3 +1609,4 @@
 ( cvs diff -u -r 1.213.2.101 -r 1.213.2.102 src/folder.c;  ) > 2.3.1cvs6.patchset
 ( cvs diff -u -r 1.149.2.52 -r 1.149.2.53 src/inc.c;  ) > 2.3.1cvs7.patchset
 ( cvs diff -u -r 1.213.2.102 -r 1.213.2.103 src/folder.c;  ) > 2.3.1cvs8.patchset
+( cvs diff -u -r 1.61.2.45 -r 1.61.2.46 src/account.c;  cvs diff -u -r 1.382.2.282 -r 1.382.2.283 src/compose.c;  cvs diff -u -r 1.105.2.55 -r 1.105.2.56 src/prefs_account.c;  cvs diff -u -r 1.49.2.19 -r 1.49.2.20 src/prefs_account.h;  cvs diff -u -r 1.1.4.43 -r 1.1.4.44 src/etpan/imap-thread.c;  ) > 2.3.1cvs9.patchset

diff --git a/configure.ac b/configure.ac
index 85ae0905a78bb575e74dda942ac7b97ab1874274..07eb3a0cd08b7fca76eafcfa95308f7d12f74c42 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/account.c b/src/account.c
index 1f6b2355f91402515eb004faa9b1e9267dfca559..cf58f6482fb3f5d5d678863dcc75b00a17df1779 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -912,7 +912,6 @@ static void account_clone(GtkWidget *widget, gpointer data)
        ACP_FASSIGN(imap_auth_type);
 
        /* send */
-       ACP_FASSIGN(add_date);
        ACP_FASSIGN(gen_msgid);
        ACP_FASSIGN(add_customhdr);
        ACP_FASSIGN(use_smtp_auth);

diff --git a/src/compose.c b/src/compose.c
index 94aad080b5792dfe1288da912c3e90bd473d3ecc..52119772aaca605f60fb588b478256f29042f814 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -5014,10 +5014,8 @@ static gchar *compose_get_header(Compose *compose)
        header = g_string_sized_new(64);
 
        /* Date */
-       if (compose->account->add_date) {
-               get_rfc822_date(buf, sizeof(buf));
-               g_string_append_printf(header, "Date: %s\n", buf);
-       }
+       get_rfc822_date(buf, sizeof(buf));
+       g_string_append_printf(header, "Date: %s\n", buf);
 
        /* From */
        

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index d9d81ee8ab24c810e6b75beae6122f8745d594b0..305d259fdd45273756396e07dfcd2072b74f6e51 100644 (file)
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -1136,7 +1136,7 @@ static void search_run(struct etpan_thread_op * op)
        struct search_param * param;
        struct search_result * result;
        int r;
-       struct mailimap_search_key * key;
+       struct mailimap_search_key * key = NULL;
        struct mailimap_search_key * uid_key = NULL;
        struct mailimap_search_key * search_type_key;
        clist * search_result;
@@ -1210,8 +1210,7 @@ static void search_run(struct etpan_thread_op * op)
                } else {
                        key = search_type_key;
                }
-       }
-       else if (uid_key != NULL) {
+       } else if (uid_key != NULL) {
                key = uid_key;
        }
        
@@ -1230,7 +1229,7 @@ static void search_run(struct etpan_thread_op * op)
                result->error = r;
                result->search_result = search_result;
        }
-       debug_print("imap search run - end %i\n", r);
+       debug_print("imap search run - end %i\n", result->error);
 }
 
 int imap_threaded_search(Folder * folder, int search_type,

diff --git a/src/prefs_account.c b/src/prefs_account.c
index fefb173304c81ccb2120c2f70d0c7b56108323db..8669572b1d2d7e0247edda2ab0aa3d6bb75a139e 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -353,10 +353,6 @@ static PrefParam param[] = {
         prefs_set_data_from_spinbtn, prefs_set_spinbtn},
 
        /* Send */
-       {"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
-        &p_send.date_chkbtn,
-        prefs_set_data_from_toggle, prefs_set_toggle},
-
        {"generate_msgid", "TRUE", &tmp_ac_prefs.gen_msgid, P_BOOL,
         &p_send.msgid_chkbtn,
         prefs_set_data_from_toggle, prefs_set_toggle},

diff --git a/src/prefs_account.h b/src/prefs_account.h
index 7e37fb58d45e889296566657633913326d27715c..44a42be856a85dfb6252b03afad5d0850447ded1 100644 (file)
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -98,7 +98,6 @@ struct _PrefsAccount
        gint imap_auth_type;
 
        /* Send */
-       gboolean add_date;
        gboolean gen_msgid;
        gboolean add_customhdr;
        gboolean use_smtp_auth;