2007-02-01 [colin] 2.7.2cvs10

	* src/codeconv.c
		Fix stray quotes in encoded strings
	* src/addressadd.c
		Fix wrong call causing g_warnings
	* src/textview.c
		Remove useless message

diff --git a/ChangeLog b/ChangeLog
index 68c744f9a7a27940c3164c676e22a1c9a1e17ebd..3b6d566436e12f9148631b1ba2636b8717f55e18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-01 [colin]     2.7.2cvs10
+
+       * src/codeconv.c
+               Fix stray quotes in encoded strings
+       * src/addressadd.c
+               Fix wrong call causing g_warnings
+       * src/textview.c
+               Remove useless message
+
 2007-01-31 [wwp]       2.7.2cvs9
 
        * src/plugins/trayicon/trayicon.c

diff --git a/PATCHSETS b/PATCHSETS
index c2e25bf671072ad2387d0a40ca3f9c4b13319097..9d88ec3bbcf9662c115d880da69e60e2a240fa04 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2327,3 +2327,4 @@
 ( cvs diff -u -r 1.115.2.130 -r 1.115.2.131 src/main.c;  cvs diff -u -r 1.382.2.355 -r 1.382.2.356 src/compose.c;  ) > 2.7.2cvs7.patchset
 ( cvs diff -u -r 1.115.2.131 -r 1.115.2.132 src/main.c;  ) > 2.7.2cvs8.patchset
 ( cvs diff -u -r 1.14.2.49 -r 1.14.2.50 src/plugins/trayicon/trayicon.c;  ) > 2.7.2cvs9.patchset
+( cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/addressadd.c;  cvs diff -u -r 1.65.2.55 -r 1.65.2.56 src/codeconv.c;  cvs diff -u -r 1.96.2.166 -r 1.96.2.167 src/textview.c;  ) > 2.7.2cvs10.patchset

diff --git a/configure.ac b/configure.ac
index 42ac0fa40499fdd86e66b7c28e6957004cd08a0f..4c9dfdd35e2e3de7508acc579b081cad492a385a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addressadd.c b/src/addressadd.c
index 6a17acb28aba43b77aa8d30be6493268a4b32c1b..f3e4a05d93f1e48568a8f06c8afb97039df4719c 100644 (file)
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -353,7 +353,7 @@ static void addressadd_load_data( AddressIndex *addrIndex ) {
                                /* Add node for address book */
                                abf = ds->rawDataSource;
                                name = &dsName;
-                               node = gtk_sctree_insert_node( tree, NULL, NULL,
+                               node = gtk_ctree_insert_node( tree, NULL, NULL,
                                                name, FOLDER_SPACING, bookXpm,
                                                bookXpmMask, bookXpm, bookXpmMask,
                                                FALSE, TRUE );

diff --git a/src/codeconv.c b/src/codeconv.c
index 8b27c862805722767990d5e3653496b7a33b876b..98115012bb84f73d0bb81d2f7c709a2303f12e99 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1574,8 +1574,8 @@ void conv_encode_header_full(gchar *dest, gint len, const gchar *src,
                        continue;
                }
 
-               /* don't include parentheses in encoded strings */
-               if (addr_field && (*srcp == '(' || *srcp == ')')) {
+               /* don't include parentheses and quotes in encoded strings */
+               if (addr_field && (*srcp == '(' || *srcp == ')' || *srcp == '"')) {
                        LBREAK_IF_REQUIRED(left < 2, FALSE);
                        *destp++ = *srcp++;
                        left--;
@@ -1598,7 +1598,7 @@ void conv_encode_header_full(gchar *dest, gint len, const gchar *src,
                                        break;
                                /* don't include parentheses in encoded
                                   strings */
-                               if (addr_field && (*p == '(' || *p == ')'))
+                               if (addr_field && (*p == '(' || *p == ')' || *p == '"'))
                                        break;
 
                                mb_len = g_utf8_skip[*p];

diff --git a/src/textview.c b/src/textview.c
index a3031c147413a2b3c78fd316b28075321a119cd6..8fe69e1df0b69f8c593ece70c03a0f54641a0f25 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -2703,7 +2703,7 @@ static void add_uri_to_addrbook_cb (TextView *textview, guint action, void *data
        /* Hiroyuki: please put this function in utils.c! */
        fromname = procheader_get_fromname(fromaddress);
        extract_address(fromaddress);
-       g_message("adding from textview %s <%s>", fromname, fromaddress);
+
        /* Add to address book - Match */
        addressbook_add_contact( fromname, fromaddress, NULL );