New address book.

[claws.git] / src / textview.c

diff --git a/src/textview.c b/src/textview.c
index ef3c18a2c64979716e1e9a7bc8375cfa8cd685bd..1ab32234f2475dcaa336d937c1df32fc925443d7 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -151,6 +151,8 @@ TextView *textview_create(void)
        /* create GtkText widgets for single-byte and multi-byte character */
        text_sb = gtk_text_new(NULL, NULL);
        text_mb = gtk_text_new(NULL, NULL);
+       GTK_TEXT(text_sb)->default_tab_width = 8;
+       GTK_TEXT(text_mb)->default_tab_width = 8;
        gtk_widget_show(text_sb);
        gtk_widget_show(text_mb);
        gtk_text_set_word_wrap(GTK_TEXT(text_sb), TRUE);
@@ -313,7 +315,7 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                mimeinfo = mimeinfo->sub;
        } else if (!mimeinfo->parent &&
                   mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
-               if (headers) procheader_header_array_destroy(headers);   
+               if (headers) procheader_header_array_destroy(headers);
                if (!mimeinfo->sub) return;
                headers = textview_scan_header(textview, fp);
                mimeinfo = mimeinfo->sub;
@@ -789,8 +791,8 @@ static void textview_write_line(TextView *textview, const gchar *str,
                textview_make_clickable_parts(textview, textview->msgfont,
                                              fg_color, &uri_color, buf);
        else
-               gtk_text_insert(text, textview->msgfont, fg_color, NULL,
-                               buf, -1);
+               textview_make_clickable_parts(textview, textview->msgfont,
+                                             fg_color, NULL, buf);
 }
 
 void textview_clear(TextView *textview)
@@ -932,9 +934,7 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
        GPtrArray *headers, *sorted_headers;
        GSList *disphdr_list;
        Header *header;
-       guint i;
-
-       textview = textview;
+       gint i;
 
        g_return_val_if_fail(fp != NULL, NULL);
 
@@ -985,7 +985,7 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
 {
        GtkText *text = GTK_TEXT(textview->text);
        Header *header;
-       guint i;
+       gint i;
 
        g_return_if_fail(headers != NULL);
 
@@ -1019,8 +1019,9 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                                                      NULL, NULL, &uri_color,
                                                      header->body);
                } else {
-                       gtk_text_insert(text, NULL, NULL, NULL,
-                                       header->body, -1);
+                       textview_make_clickable_parts(textview,
+                                                     NULL, NULL, NULL,
+                                                     header->body);
                }
                gtk_text_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
        }
@@ -1270,7 +1271,8 @@ static void textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                                fromname = procheader_get_fromname(fromaddress);
                                                extract_address(fromaddress);
                                                g_message("adding from textview %s <%s>", fromname, fromaddress);
-                                               addressbook_add_contact_by_menu(NULL, fromname, fromaddress, NULL);
+                                               // Add to address book - Match
+                                               addressbook_add_contact( fromname, fromaddress, NULL );
                                                g_free(fromaddress);
                                                g_free(fromname);
                                        } else {