0.8.10claws85
authorChristoph Hohmann <reboot@gmx.ch>
Wed, 5 Mar 2003 19:46:21 +0000 (19:46 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Wed, 5 Mar 2003 19:46:21 +0000 (19:46 +0000)
* src/compose.c
* src/common/utils.[ch]
        don't strip address comments when building Cc lists

(closes Bug 47 Replying to message strips name part of e-mail addresses
 of Cc: lines)

* src/folder.c
        fix return value of copy function

ChangeLog.claws
configure.ac
src/common/utils.c
src/common/utils.h
src/compose.c
src/folder.c

index f2f256f166fcf3d85f5aa3434a3ae7339f8124bb..4c36fd123ba9382694f5b13e5997b661165dd1ac 100644 (file)
@@ -1,3 +1,15 @@
+2003-03-05 [christoph] 0.8.10claws85
+
+       * src/compose.c
+       * src/common/utils.[ch]
+               don't strip address comments when building Cc lists
+
+       (closes Bug 47 Replying to message strips name part of e-mail addresses
+        of Cc: lines)
+
+       * src/folder.c
+               fix return value of copy function
+
 2003-03-05 [christoph] 0.8.10claws84
 
        * src/imap.c
index 84e7fc3d7ad120390216b3d23857cb3e3ed7fb5a..5f4416e8073db4195f29ae62c4e72c7ea65f21f2 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws84
+EXTRA_VERSION=claws85
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 24e153dc319b177cb8430064daac848c1ce3d2f2..0d49ca6f520a7044f936447962fb8b22d156f900 100644 (file)
@@ -756,7 +756,7 @@ void extract_address(gchar *str)
        g_strstrip(str);
 }
 
-GSList *address_list_append(GSList *addr_list, const gchar *str)
+static GSList *address_list_append_real(GSList *addr_list, const gchar *str, gboolean removecomments)
 {
        gchar *work;
        gchar *workp;
@@ -765,7 +765,8 @@ GSList *address_list_append(GSList *addr_list, const gchar *str)
 
        Xstrdup_a(work, str, return addr_list);
 
-       eliminate_address_comment(work);
+       if (removecomments)
+               eliminate_address_comment(work);
        workp = work;
 
        while (workp && *workp) {
@@ -777,7 +778,7 @@ GSList *address_list_append(GSList *addr_list, const gchar *str)
                } else
                        next = NULL;
 
-               if (strchr_with_skip_quote(workp, '"', '<'))
+               if (removecomments && strchr_with_skip_quote(workp, '"', '<'))
                        extract_parenthesis_with_skip_quote
                                (workp, '"', '<', '>');
 
@@ -791,6 +792,16 @@ GSList *address_list_append(GSList *addr_list, const gchar *str)
        return addr_list;
 }
 
+GSList *address_list_append(GSList *addr_list, const gchar *str)
+{
+       return address_list_append_real(addr_list, str, TRUE);
+}
+
+GSList *address_list_append_with_comments(GSList *addr_list, const gchar *str)
+{
+       return address_list_append_real(addr_list, str, FALSE);
+}
+
 GSList *references_list_append(GSList *msgid_list, const gchar *str)
 {
        const gchar *strp;
index dcb59ded4ce87d847105dd75905a4c8c3962bc8d..f2ae5992329a3fbf2e521dbf35a848d4d9ad967c 100644 (file)
@@ -253,6 +253,8 @@ GSList *slist_concat_unique         (GSList         *first,
                                         GSList         *second);
 GSList *address_list_append            (GSList         *addr_list,
                                         const gchar    *str);
+GSList *address_list_append_with_comments(GSList       *addr_list,
+                                        const gchar    *str);
 GSList *references_list_append         (GSList         *msgid_list,
                                         const gchar    *str);
 GSList *newsgroup_list_append          (GSList         *group_list,
index 862e59837fdc790b1f1fcdf4f582119514596903..7cbafa54a926d19a255417d2f0b3335ea90b5b20 100644 (file)
@@ -1806,9 +1806,9 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
        }
 
        if (replyto && from)
-               cc_list = address_list_append(cc_list, from);
-       cc_list = address_list_append(cc_list, msginfo->to);
-       cc_list = address_list_append(cc_list, compose->cc);
+               cc_list = address_list_append_with_comments(cc_list, from);
+       cc_list = address_list_append_with_comments(cc_list, msginfo->to);
+       cc_list = address_list_append_with_comments(cc_list, compose->cc);
 
        to_table = g_hash_table_new(g_str_hash, g_str_equal);
        if (replyto)
index 3a6535cc95577f4a69e3b454ab9000b1114ae96a..000a1dbffcd0e5f458dc892462515302c4600cdd 100644 (file)
@@ -2002,7 +2002,7 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
                folder->finished_copy(folder, dest);
 
        g_slist_free(newmsgnums);
-       return dest->last_num;
+       return lastnum;
 }
 
 gint folder_item_remove_msg(FolderItem *item, gint num)