sync with Hiroyuki's 0.5.0claws2-3
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Sun, 15 Jul 2001 13:54:20 +0000 (13:54 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Sun, 15 Jul 2001 13:54:20 +0000 (13:54 +0000)
ChangeLog
ChangeLog.jp
src/textview.c

index 8d78e0e..0bbf504 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,8 @@
          folder tree when a news account was added.
        * src/grouplistdialog.c: made exclusive lock variable global, and
          lock at grouplist_dialog_set_list().
+       * src/textview.c: fixed a bug that disabled clickable URI if
+         message color was disabled.
 
 2001-07-15
 
index 021b976..9bbc26d 100644 (file)
@@ -28,6 +28,8 @@
          ¥Õ¥©¥ë¥À¥Ä¥ê¡¼¤ò¹¹¿·¤·¤Æ¤¤¤Ê¤«¤Ã¤¿¥Ð¥°¤ò½¤Àµ¡£
        * src/grouplistdialog.c: ÇÓ¾¥í¥Ã¥¯ÊÑ¿ô¤ò¥°¥í¡¼¥Ð¥ë¤Ë¤·¡¢
          grouplist_dialog_set_list() ¤Ç¥í¥Ã¥¯¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/textview.c: ¥á¥Ã¥»¡¼¥¸¤Î¿§¤ò̵¸ú¤Ë¤·¤¿¤È¤­¤Ë¥¯¥ê¥Ã¥«¥Ö¥ë URI
+         ¤â̵¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤¿¥Ð¥°¤ò½¤Àµ¡£
 
 2001-07-15
 
index ef3c18a..2bf490c 100644 (file)
@@ -313,7 +313,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 +789,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 +932,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 +983,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 +1017,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);
        }