2007-08-09 [colin] 2.10.0cvs109

	* src/editldap.c
		Fix port being reset to 636 on SSL
	* src/folder.c
		Fix folder_item_get_msg_num_by_file
		on drafts/queue folders

diff --git a/ChangeLog b/ChangeLog
index 869a7481c79babbf2b299146694b7ac6bdf0deeb..f90cb7b02911287103db3e8f2f5264650c3dfc21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-09 [colin]     2.10.0cvs109
+
+       * src/editldap.c
+               Fix port being reset to 636 on SSL
+       * src/folder.c
+               Fix folder_item_get_msg_num_by_file
+               on drafts/queue folders
+
 2007-08-09 [wwp]       2.10.0cvs108
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 9d1993fb203c0b7fde9bc66d20942e97d48e77c0..996d9e662239fd48afb0e17daad93947f9c1a7a6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2762,3 +2762,4 @@
 ( cvs diff -u -r 1.105.2.106 -r 1.105.2.107 src/prefs_account.c;  ) > 2.10.0cvs106.patchset
 ( cvs diff -u -r 1.207.2.171 -r 1.207.2.172 src/folderview.c;  cvs diff -u -r 1.395.2.317 -r 1.395.2.318 src/summaryview.c;  cvs diff -u -r 1.12.2.39 -r 1.12.2.40 src/gtk/prefswindow.c;  ) > 2.10.0cvs107.patchset
 ( cvs diff -u -r 1.213.2.153 -r 1.213.2.154 src/folder.c;  ) > 2.10.0cvs108.patchset
+( cvs diff -u -r 1.8.2.23 -r 1.8.2.24 src/editldap.c;  cvs diff -u -r 1.213.2.154 -r 1.213.2.155 src/folder.c;  ) > 2.10.0cvs109.patchset

diff --git a/configure.ac b/configure.ac
index 527c05aed4e151bebda042d59d4d900eca4fc805..d32cb60e5af44fb9bce7d2ba8e4e534a09c3dd24 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=108
+EXTRA_VERSION=109
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/editldap.c b/src/editldap.c
index e7e287771f88e660065ca2f675f22ad5861f01e3..391b511ded8efacbed616816b18c9ea513b2d3f0 100644 (file)
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -934,8 +934,6 @@ static void edit_ldap_set_fields( LdapServer *server ) {
        if( ctl->bindPass )
                gtk_entry_set_text(
                        GTK_ENTRY(ldapedit.entry_bindPW), ctl->bindPass );
-       gtk_spin_button_set_value(
-               GTK_SPIN_BUTTON(ldapedit.spinbtn_port), ctl->port );
        gtk_spin_button_set_value(
                GTK_SPIN_BUTTON(ldapedit.spinbtn_timeout), ctl->timeOut );
        gtk_spin_button_set_value(
@@ -946,6 +944,8 @@ static void edit_ldap_set_fields( LdapServer *server ) {
        gtk_toggle_button_set_active(
                GTK_TOGGLE_BUTTON(ldapedit.enable_ssl), ctl->enableSSL );
 #endif
+       gtk_spin_button_set_value(
+               GTK_SPIN_BUTTON(ldapedit.spinbtn_port), ctl->port );
        /* Format criteria */
        crit = editldap_build_criteria_list( ctl );
        if( crit ) {

diff --git a/src/folder.c b/src/folder.c
index 869cdc7160d3c2bf3458c74e9f2ba903b0dc4066..8e06c7a6a34aa5b7ae48b6ceabd006d4748a4fee 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2688,10 +2688,27 @@ static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
 
        if ((folder_has_parent_of_type(dest, F_QUEUE)) || 
            (folder_has_parent_of_type(dest, F_DRAFT)))
-               while (fgets(buf, sizeof(buf), fp) != NULL)
+               while (fgets(buf, sizeof(buf), fp) != NULL) {
+                       /* new way */
+                       if ((!strncmp(buf, "X-Claws-End-Special-Headers: 1",
+                               strlen("X-Claws-End-Special-Headers:"))) ||
+                           (!strncmp(buf, "X-Sylpheed-End-Special-Headers: 1",
+                               strlen("X-Sylpheed-End-Special-Headers:"))))
+                               break;
+                       /* old way */
                        if (buf[0] == '\r' || buf[0] == '\n') break;
+                       /* from other mailers */
+                       if (!strncmp(buf, "Date: ", 6)
+                       ||  !strncmp(buf, "To: ", 4)
+                       ||  !strncmp(buf, "From: ", 6)
+                       ||  !strncmp(buf, "Subject: ", 9)) {
+                               rewind(fp);
+                               break;
+                       }
+               }
 
        procheader_get_header_fields(fp, hentry);
+       debug_print("looking for %s\n", hentry[0].body);
        if (hentry[0].body) {
                extract_parenthesis(hentry[0].body, '<', '>');
                remove_space(hentry[0].body);
@@ -2881,6 +2898,7 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
                                        folderscan = TRUE;
                                }
                                num = folder_item_get_msg_num_by_file(dest, fileinfo->file);
+                               debug_print("got num %d\n", num);
                        }
 
                        if (num > lastnum)