2006-09-13 [colin] 2.4.0cvs185

[claws.git] / src / textview.c

diff --git a/src/textview.c b/src/textview.c
index 0fe2b89d17312574e5d9d640af1ced7124953ef6..63842336a7a1638c2a369be4022de25498686bc7 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -35,7 +35,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
+#if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
 #if HAVE_LIBCOMPFACE
 #  include <compface.h>
 #endif
@@ -403,6 +405,18 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
        gtk_text_buffer_create_tag(buffer, "header_title",
                                   "font-desc", bold_font_desc,
                                   NULL);
+       tag = gtk_text_buffer_create_tag(buffer, "hlink",
+                                  "pixels-above-lines", 0,
+                                  "pixels-above-lines-set", TRUE,
+                                  "pixels-below-lines", 0,
+                                  "pixels-below-lines-set", TRUE,
+                                  "font-desc", font_desc,
+                                  "left-margin", 3,
+                                  "left-margin-set", TRUE,
+                                  "foreground-gdk", &uri_color,
+                                  NULL);
+       g_signal_connect(G_OBJECT(tag), "event",
+                         G_CALLBACK(textview_uri_button_pressed), textview);
        if (prefs_common.enable_bgcolor) {
                gtk_text_buffer_create_tag(buffer, "quote0",
                                "foreground-gdk", &quote_colors[0],
@@ -926,6 +940,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                        g_unlink(filename);
                }
                g_free(filename);
+#ifndef G_OS_WIN32
        } else if ( g_ascii_strcasecmp(mimeinfo->subtype, "plain") &&
                   (cmd = prefs_common.mime_textviewer) && *cmd &&
                   (p = strchr(cmd, '%')) && *(p + 1) == 's') {
@@ -988,6 +1003,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                fclose(tmpfp);
                waitpid(pid, pfd, 0);
                unlink(fname);
+#endif
        } else {
 textview_default:
                lines = 0;
@@ -1894,7 +1910,7 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                          procheader_headername_equal(header->name, "Reply-To") ||
                          procheader_headername_equal(header->name, "Sender");
                        textview_make_clickable_parts(textview, "header", 
-                                                     "link", header->body, 
+                                                     "hlink", header->body, 
                                                      hdr);
                }
                gtk_text_buffer_get_end_iter (buffer, &iter);
@@ -2104,7 +2120,7 @@ static void textview_uri_update(TextView *textview, gint x, gint y)
 
                        g_object_get(G_OBJECT(tag), "name", &name, NULL);
 
-                       if ((!strcmp(name, "link"))
+                       if ((!strcmp(name, "link") || !strcmp(name, "hlink"))
                            && textview_get_uri_range(textview, &iter, tag,
                                                      &start_iter, &end_iter)) {