2004-12-01 [paul] 0.9.12cvs177.2

	* src/addrharvest.c
		fix 'harvest addresses'

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 03d5a2a7a0ae784f7ab72207fd8cf865920706c6..27f4c2e432ec6f502380a506212fc4efd16c49fb 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-12-01 [paul]      0.9.12cvs177.2
+
+       * src/addrharvest.c
+               fix 'harvest addresses'
+
 2004-11-30 [colin]     0.9.12cvs177.1
 
        * src/gtk/prefswindow.c

diff --git a/PATCHSETS b/PATCHSETS
index a7fd7741da1e19149b83b88364b2c9cbb6fad091..188500a59f1b00addee460ce4465cbe7adcbde0f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -267,3 +267,4 @@
 ( cvs diff -u -r 1.49.2.23 -r 1.49.2.24 src/procmime.c; ) > 0.9.12cvs175.1.patchset
 ( cvs diff -u -r 1.207.2.22 -r 1.207.2.23 src/folderview.c; ) > 0.9.12cvs176.1.patchset
 ( cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/gtk/prefswindow.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/gtk/pluginwindow.c; ) > 0.9.12cvs177.1.patchset
+( cvs diff -u -r 1.6.10.1 -r 1.6.10.2 src/addrharvest.c; ) > 0.9.12cvs177.2.patchset

diff --git a/configure.ac b/configure.ac
index 39d57cb7b8dd2fc3fa0a54427535f796684b3f85..e275b4a039ba19b4313b15177e7cacbd6df382cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=177
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/addrharvest.c b/src/addrharvest.c
index 18a567472a4158d9d89044106bc10b40e21c470f..c71ef48f33e59e4f094532a19e9fe5b28e4f842e 100644 (file)
--- a/src/addrharvest.c
+++ b/src/addrharvest.c
@@ -201,7 +201,8 @@ static HeaderEntry *addrharvest_find(
                HeaderEntry *entry;
 
                entry = node->data;
-               if( g_utf8_collate( entry->header, name ) == 0 ) {
+               if (g_ascii_strncasecmp(entry->header, name,
+                                       sizeof(entry->header)) == 0 ) {
                        retVal = entry;
                        break;
                }
@@ -555,6 +556,7 @@ static void addrharvest_parse_address(
                        }
                        else {
                                name = buffer;
+                               conv_unmime_header_overwrite(name);
                        }
 
                        /* Insert into address book */
@@ -586,7 +588,7 @@ static gboolean addrharvest_check_hdr( GList *listHdr, gchar *buf ) {
                node = listHdr;
                while( node ) {
                        nhdr = node->data;
-                       if( g_utf8_collate( nhdr, hdr ) == 0 ) {
+                       if (g_ascii_strncasecmp(nhdr, hdr, sizeof(nhdr)) == 0 ) {
                                retVal = TRUE;
                                break;
                        }