sync with sylpheed 0.7.0cvs38

[claws.git] / src / addr_compl.c

diff --git a/src/addr_compl.c b/src/addr_compl.c
index 2b8a284b0189c61b4f7f627e5ddf35bbc7478457..6cfafc5c2a8e2cfd0e4628106db67b674101b68a 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -220,11 +220,13 @@ gchar *get_address_from_edit(GtkEntry *entry, gint *start_pos)
        wchar_t *wp;
        wchar_t rfc_mail_sep;
        wchar_t quote;
        wchar_t *wp;
        wchar_t rfc_mail_sep;
        wchar_t quote;

+       wchar_t lt;

        gboolean in_quote = FALSE;
        gchar *str;
 
        if (mbtowc(&rfc_mail_sep, ",", 1) < 0) return NULL;
        if (mbtowc(&quote, "\"", 1) < 0) return NULL;
        gboolean in_quote = FALSE;
        gchar *str;
 
        if (mbtowc(&rfc_mail_sep, ",", 1) < 0) return NULL;
        if (mbtowc(&quote, "\"", 1) < 0) return NULL;

+       if (mbtowc(&lt, "<", 1) < 0) return NULL;

 
        edit_text = gtk_entry_get_text(entry);
        if (edit_text == NULL) return NULL;
 
        edit_text = gtk_entry_get_text(entry);
        if (edit_text == NULL) return NULL;


@@ -248,7 +250,8 @@ gchar *get_address_from_edit(GtkEntry *entry, gint *start_pos)
                return NULL;
        }
 
                return NULL;
        }
 

-#define IS_VALID_CHAR(x)       (iswalnum(x) || (x) == quote || ((x) > 0x7f))
+#define IS_VALID_CHAR(x) \
+       (iswalnum(x) || (x) == quote || (x) == lt || ((x) > 0x7f))

 
        /* now scan back until we hit a valid character */
        for (; *wp && !IS_VALID_CHAR(*wp); wp++)
 
        /* now scan back until we hit a valid character */
        for (; *wp && !IS_VALID_CHAR(*wp); wp++)


@@ -345,7 +348,9 @@ gchar *get_complete_address(gint index)
                        p = (address_entry *)g_slist_nth_data
                                (g_completion_addresses, index - 1);
                        if (p != NULL) {
                        p = (address_entry *)g_slist_nth_data
                                (g_completion_addresses, index - 1);
                        if (p != NULL) {

-                               if (strchr_with_skip_quote(p->name, '"', ','))
+                               if (!p->name || p->name[0] == '\0')
+                                       address = g_strdup_printf(p->address);
+                               else if (strchr_with_skip_quote(p->name, '"', ','))

                                        address = g_strdup_printf
                                                ("\"%s\" <%s>", p->name, p->address);
                                else
                                        address = g_strdup_printf
                                                ("\"%s\" <%s>", p->name, p->address);
                                else