2007-02-01 [colin] 2.7.2cvs10
authorColin Leroy <colin@colino.net>
Thu, 1 Feb 2007 07:27:50 +0000 (07:27 +0000)
committerColin Leroy <colin@colino.net>
Thu, 1 Feb 2007 07:27:50 +0000 (07:27 +0000)
* src/codeconv.c
Fix stray quotes in encoded strings
* src/addressadd.c
Fix wrong call causing g_warnings
* src/textview.c
Remove useless message

ChangeLog
PATCHSETS
configure.ac
src/addressadd.c
src/codeconv.c
src/textview.c

index 68c744f..3b6d566 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
index c2e25bf..9d88ec3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 42ac0fa..4c9dfdd 100644 (file)
@@ -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=
 
index 6a17acb..f3e4a05 100644 (file)
@@ -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 );
index 8b27c86..9811501 100644 (file)
@@ -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];
index a3031c1..8fe69e1 100644 (file)
@@ -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 );