2005-02-12 [paul] 1.0.1cvs4.4
[claws.git] / src / textview.c
index d7e589d3d93f65bfec07483eadb0e039ab100e16..5dfa78cc904db2eb7f9f7336116c3401085080e1 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkvbox.h>
@@ -34,7 +35,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "main.h"
 #include "summaryview.h"
 #include "procheader.h"
@@ -192,13 +192,29 @@ static void open_uri_cb                           (TextView       *textview,
 static void copy_uri_cb                                (TextView       *textview,
                                                 guint           action,
                                                 void           *data);
+static void add_uri_to_addrbook_cb             (TextView       *textview, 
+                                                guint           action, 
+                                                void           *data);
+static void mail_to_uri_cb                     (TextView       *textview, 
+                                                guint           action, 
+                                                void           *data);
+static void copy_mail_to_uri_cb                        (TextView       *textview,
+                                                guint           action,
+                                                void           *data);
 
-static GtkItemFactoryEntry textview_popup_entries[] = 
+static GtkItemFactoryEntry textview_link_popup_entries[] = 
 {
        {N_("/_Open link"),             NULL, open_uri_cb, 0, NULL},
        {N_("/_Copy link location"),    NULL, copy_uri_cb, 0, NULL},
 };
 
+static GtkItemFactoryEntry textview_mail_popup_entries[] = 
+{
+       {N_("/_Add to addressbook"),    NULL, add_uri_to_addrbook_cb, 0, NULL},
+       {N_("/_Email"),                 NULL, mail_to_uri_cb, 0, NULL},
+       {N_("/_Copy"),                  NULL, copy_mail_to_uri_cb, 0, NULL},
+};
+
 
 TextView *textview_create(void)
 {
@@ -208,20 +224,21 @@ TextView *textview_create(void)
        GtkWidget *text;
        GtkTextBuffer *buffer;
        GtkClipboard *clipboard;
-       GtkItemFactory *popupfactory;
-       GtkWidget *popupmenu;
+       GtkItemFactory *link_popupfactory, *mail_popupfactory;
+       GtkWidget *link_popupmenu, *mail_popupmenu;
        gint n_entries;
-       PangoFontDescription *font_desc = NULL;
 
        debug_print("Creating text view...\n");
        textview = g_new0(TextView, 1);
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_widget_set_size_request(scrolledwin, prefs_common.mainview_width, -1);
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
        gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
                                            GTK_SHADOW_IN);
+       gtk_widget_set_size_request
+               (scrolledwin, prefs_common.mainview_width, -1);
 
        /* create GtkSText widgets for single-byte and multi-byte character */
        text = gtk_text_view_new();
@@ -230,6 +247,8 @@ TextView *textview_create(void)
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
        gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(text), FALSE);
+       gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text), 6);
+       gtk_text_view_set_right_margin(GTK_TEXT_VIEW(text), 6);
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
        clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
@@ -237,23 +256,10 @@ TextView *textview_create(void)
 
        gtk_widget_ensure_style(text);
 
-       if (prefs_common.normalfont)
-               font_desc = pango_font_description_from_string
-                                       (prefs_common.normalfont);
-       if (font_desc) {
-               gtk_widget_modify_font(text, font_desc);
-       }
-       pango_font_description_free(font_desc);
-
        gtk_widget_ref(scrolledwin);
 
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
 
-       if (!hand_cursor)
-               hand_cursor = gdk_cursor_new(GDK_HAND2);
-       if (!text_cursor)
-               text_cursor = gdk_cursor_new(GDK_XTERM);
-
        g_signal_connect(G_OBJECT(text), "key_press_event",
                         G_CALLBACK(textview_key_pressed),
                         textview);
@@ -274,40 +280,63 @@ TextView *textview_create(void)
 
        gtk_widget_show(vbox);
 
-       n_entries = sizeof(textview_popup_entries) /
-               sizeof(textview_popup_entries[0]);
-       popupmenu = menu_create_items(textview_popup_entries, n_entries,
-                                     "<UriPopupMenu>", &popupfactory,
+       n_entries = sizeof(textview_link_popup_entries) /
+               sizeof(textview_link_popup_entries[0]);
+       link_popupmenu = menu_create_items(textview_link_popup_entries, n_entries,
+                                     "<UriPopupMenu>", &link_popupfactory,
                                      textview);
 
-       textview->vbox             = vbox;
-       textview->scrolledwin      = scrolledwin;
-       textview->text             = text;
-       textview->uri_list         = NULL;
-       textview->body_pos         = 0;
-       textview->show_all_headers = FALSE;
-       textview->last_buttonpress = GDK_NOTHING;
-       textview->popup_menu       = popupmenu;
-       textview->popup_factory    = popupfactory;
+       n_entries = sizeof(textview_mail_popup_entries) /
+               sizeof(textview_mail_popup_entries[0]);
+       mail_popupmenu = menu_create_items(textview_mail_popup_entries, n_entries,
+                                     "<UriPopupMenu>", &mail_popupfactory,
+                                     textview);
+
+       textview->vbox               = vbox;
+       textview->scrolledwin        = scrolledwin;
+       textview->text               = text;
+       textview->uri_list           = NULL;
+       textview->body_pos           = 0;
+       textview->show_all_headers   = FALSE;
+       textview->last_buttonpress   = GDK_NOTHING;
+       textview->link_popup_menu    = link_popupmenu;
+       textview->link_popup_factory = link_popupfactory;
+       textview->mail_popup_menu    = mail_popupmenu;
+       textview->mail_popup_factory = mail_popupfactory;
 
        return textview;
 }
 
 static void textview_create_tags(GtkTextView *text, TextView *textview)
 {
-       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextBuffer *buffer;
        GtkTextTag *tag;
+       static PangoFontDescription *font_desc, *bold_font_desc;
+
+       if (!font_desc)
+               font_desc = pango_font_description_from_string
+                       (NORMAL_FONT);
+
+       if (!bold_font_desc) {
+               bold_font_desc = pango_font_description_from_string
+                       (BOLD_FONT);
+               pango_font_description_set_weight
+                       (bold_font_desc, PANGO_WEIGHT_BOLD);
+       }
+
+       buffer = gtk_text_view_get_buffer(text);
 
        gtk_text_buffer_create_tag(buffer, "header",
                                   "pixels-above-lines", 0,
                                   "pixels-above-lines-set", TRUE,
                                   "pixels-below-lines", 0,
                                   "pixels-below-lines-set", TRUE,
+                                  "font-desc", font_desc,
                                   "left-margin", 0,
                                   "left-margin-set", TRUE,
                                   NULL);
        gtk_text_buffer_create_tag(buffer, "header_title",
-                                  "font", prefs_common.boldfont,
+                                  "font-desc", bold_font_desc,
                                   NULL);
        gtk_text_buffer_create_tag(buffer, "quote0",
                                   "foreground-gdk", &quote_colors[0],
@@ -328,6 +357,7 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
                                         "foreground-gdk", &uri_color,
                                         NULL);
        gtk_text_buffer_create_tag(buffer, "link-hover",
+                                  "foreground-gdk", &uri_color,
                                   "underline", PANGO_UNDERLINE_SINGLE,
                                   NULL);
 
@@ -337,11 +367,14 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
 
 void textview_init(TextView *textview)
 {
-       gtkut_widget_disable_theme_engine(textview->text);
+       if (!hand_cursor)
+               hand_cursor = gdk_cursor_new(GDK_HAND2);
+       if (!text_cursor)
+               text_cursor = gdk_cursor_new(GDK_XTERM);
+
        textview_update_message_colors();
        textview_set_all_headers(textview, FALSE);
        textview_set_font(textview, NULL);
-
        textview_create_tags(GTK_TEXT_VIEW(textview->text), textview);
 }
 
@@ -1121,22 +1154,19 @@ static void textview_make_clickable_parts(TextView *textview,
                                                               last->ep);
                        uri->start = gtk_text_iter_get_offset(&iter);
                        gtk_text_buffer_insert_with_tags_by_name
-                               (buffer, &iter,
-                                last->bp, last->ep - last->bp,
-                                uri_tag, NULL);
+                               (buffer, &iter, last->bp, last->ep - last->bp,
+                                uri_tag, fg_tag, NULL);
                        uri->end = gtk_text_iter_get_offset(&iter);
                        textview->uri_list =
                                g_slist_append(textview->uri_list, uri);
                }
 
                if (*normal_text)
-                       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
-                                                                normal_text, -1,
-                                                                fg_tag, NULL);
+                       gtk_text_buffer_insert_with_tags_by_name
+                               (buffer, &iter, normal_text, -1, fg_tag, NULL);
        } else {
-               gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
-                                                        linebuf, -1,
-                                                        fg_tag, NULL);
+               gtk_text_buffer_insert_with_tags_by_name
+                       (buffer, &iter, linebuf, -1, fg_tag, NULL);
        }
 }
 
@@ -1157,14 +1187,13 @@ static void textview_write_line(TextView *textview, const gchar *str,
        buffer = gtk_text_view_get_buffer(text);
        gtk_text_buffer_get_end_iter(buffer, &iter);
 
-       if (!conv) {
+       if (!conv)
                strncpy2(buf, str, sizeof(buf));
-       } else if (conv_convert(conv, buf, sizeof(buf), str) < 0) {
-               conv_localetodisp(buf, sizeof(buf), str);
-       }
+       else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
+               conv_utf8todisp(buf, sizeof(buf), str);
 
        strcrchomp(buf);
-       if (prefs_common.conv_mb_alnum) conv_mb_alnum(buf);
+       //if (prefs_common.conv_mb_alnum) conv_mb_alnum(buf);
        fg_color = NULL;
 
        /* change color of quotation
@@ -1222,23 +1251,10 @@ void textview_write_link(TextView *textview, const gchar *str,
        buffer = gtk_text_view_get_buffer(text);
        gtk_text_buffer_get_end_iter(buffer, &iter);
 
-#warning FIXME_GTK2
-#if 0
-       if (!conv) {
-               if (textview->text_is_mb)
-                       conv_localetodisp(buf, sizeof(buf), str);
-               else
-                       strncpy2(buf, str, sizeof(buf));
-       } else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
-               conv_localetodisp(buf, sizeof(buf), str);
-       else if (textview->text_is_mb)
-               conv_unreadable_locale(buf);
-#else
        if (!conv)
                strncpy2(buf, str, sizeof(buf));
        else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
-               conv_localetodisp(buf, sizeof(buf), str);
-#endif
+               conv_utf8todisp(buf, sizeof(buf), str);
 
        strcrchomp(buf);
 
@@ -1253,8 +1269,8 @@ void textview_write_link(TextView *textview, const gchar *str,
        r_uri = g_new(RemoteURI, 1);
        r_uri->uri = g_strdup(uri);
        r_uri->start = gtk_text_iter_get_offset(&iter);
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, bufp, -1,
-                                                "link", NULL);
+       gtk_text_buffer_insert_with_tags_by_name
+               (buffer, &iter, bufp, -1, "link", NULL);
        r_uri->end = gtk_text_iter_get_offset(&iter);
        textview->uri_list = g_slist_append(textview->uri_list, r_uri);
 }
@@ -1292,8 +1308,7 @@ void textview_set_font(TextView *textview, const gchar *codeset)
        if (prefs_common.textfont) {
                PangoFontDescription *font_desc = NULL;
 
-               if (prefs_common.textfont)
-                       font_desc = pango_font_description_from_string
+               font_desc = pango_font_description_from_string
                                                (prefs_common.textfont);
                if (font_desc) {
                        gtk_widget_modify_font(textview->text, font_desc);
@@ -1304,11 +1319,6 @@ void textview_set_font(TextView *textview, const gchar *codeset)
                                             prefs_common.line_space / 2);
        gtk_text_view_set_pixels_below_lines(GTK_TEXT_VIEW(textview->text),
                                             prefs_common.line_space / 2);
-       if (prefs_common.head_space) {
-               gtk_text_view_set_left_margin(GTK_TEXT_VIEW(textview->text), 6);
-       } else {
-               gtk_text_view_set_left_margin(GTK_TEXT_VIEW(textview->text), 0);
-       }
 }
 
 void textview_set_text(TextView *textview, const gchar *text)
@@ -1471,124 +1481,79 @@ gboolean textview_search_string(TextView *textview, const gchar *str,
                                gboolean case_sens)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextBuffer *buffer;
+       GtkTextIter iter, end_iter;
        GtkTextMark *mark;
-       GtkTextIter iter, start, end, real_end, *pos;
-       gboolean found = FALSE;
-       gint insert_offset, selbound_offset;
+       gint pos;
+       gint len;
 
-       /* reset selection */
-       mark = gtk_text_buffer_get_mark(buffer, "insert");
-       gtk_text_buffer_get_iter_at_mark(buffer, &start, mark);
-       insert_offset = gtk_text_iter_get_offset(&start);
-       mark = gtk_text_buffer_get_mark(buffer, "selection_bound");
-       gtk_text_buffer_get_iter_at_mark(buffer, &end, mark);
-       selbound_offset = gtk_text_iter_get_offset(&end);
+       g_return_val_if_fail(str != NULL, FALSE);
 
-       pos = insert_offset > selbound_offset ? &start : &end;
-       gtk_text_buffer_place_cursor(buffer, pos);
+       buffer = gtk_text_view_get_buffer(text);
+
+       len = g_utf8_strlen(str, -1);
+       g_return_val_if_fail(len >= 0, FALSE);
 
-       /* search */
        mark = gtk_text_buffer_get_insert(buffer);
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
-       if (case_sens) {
-               found = gtk_text_iter_forward_search(&iter, str,
-                                            GTK_TEXT_SEARCH_VISIBLE_ONLY,
-                                            &start, &end, NULL);
-       } else {
-               gchar *text = NULL;
-               int i = 0;
-               gtk_text_buffer_get_end_iter(buffer, &real_end);
-               text = gtk_text_buffer_get_text(buffer, &iter, 
-                                               &real_end, FALSE);
-               
-               while (!found && i++ < strlen(text) - 1) {
-                       found = (strncasecmp(text+i, str, strlen(str)) == 0);
-               }
-               
-               i += gtk_text_iter_get_offset(&end);
-               
-               if (found) {
-                       gtk_text_buffer_get_iter_at_offset(buffer, &start, i);
-                       gtk_text_buffer_get_iter_at_offset(buffer, &end, 
-                                                          i + strlen(str));
-               }
-               
-               g_free(text);
-       }
-       
-       if (found) {
-               gtk_text_buffer_place_cursor(buffer, &start);
-               gtk_text_buffer_move_mark_by_name(buffer, "selection_bound", 
-                                                 &end);
-               mark = gtk_text_buffer_get_mark(buffer, "insert");
-               gtk_text_view_scroll_mark_onscreen(text, mark);
+       pos = gtk_text_iter_get_offset(&iter);
+
+       if ((pos = gtkut_text_buffer_find(buffer, pos, str, case_sens)) != -1) {
+               gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, pos);
+               gtk_text_buffer_get_iter_at_offset(buffer, &iter, pos + len);
+               gtk_text_buffer_select_range(buffer, &iter, &end_iter);
+               gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
+               return TRUE;
        }
 
-       return found;
+       return FALSE;
 }
 
 gboolean textview_search_string_backward(TextView *textview, const gchar *str,
                                         gboolean case_sens)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextBuffer *buffer;
+       GtkTextIter iter, end_iter;
        GtkTextMark *mark;
-       GtkTextIter iter, start, real_start, end, *pos;
+       gint pos;
+       gunichar *wcs;
+       gint len;
+       glong items_read = 0, items_written = 0;
+       GError *error = NULL;
        gboolean found = FALSE;
-       gint insert_offset, selbound_offset;
 
-       /* reset selection */
-       mark = gtk_text_buffer_get_mark(buffer, "insert");
-       gtk_text_buffer_get_iter_at_mark(buffer, &start, mark);
-       insert_offset = gtk_text_iter_get_offset(&start);
-       mark = gtk_text_buffer_get_mark(buffer, "selection_bound");
-       gtk_text_buffer_get_iter_at_mark(buffer, &end, mark);
-       selbound_offset = gtk_text_iter_get_offset(&end);
+       g_return_val_if_fail(str != NULL, FALSE);
 
-       pos = insert_offset < selbound_offset ? &start : &end;
-       gtk_text_buffer_place_cursor(buffer, pos);
+       buffer = gtk_text_view_get_buffer(text);
+
+       wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
+       if (error != NULL) {
+               g_warning("An error occured while converting a string from UTF-8 to UCS-4: %s\n", error->message);
+               g_error_free(error);
+       }
+       if (!wcs || items_written <= 0) return FALSE;
+       len = (gint)items_written;
 
-       /* search */
        mark = gtk_text_buffer_get_insert(buffer);
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
-       if (case_sens) {
-               found = gtk_text_iter_backward_search(&iter, str,
-                                             GTK_TEXT_SEARCH_VISIBLE_ONLY,
-                                             &start, &end, NULL);
-       } else {
-               gchar *text = NULL;
-               int i = 0;
-               if (gtk_text_iter_get_offset(&iter) == 0) 
-                       gtk_text_buffer_get_end_iter(buffer, &iter);
-               
-               i = gtk_text_iter_get_offset(&iter) - strlen(str) - 1;
-               gtk_text_buffer_get_start_iter(buffer, &real_start);
-               
-               text = gtk_text_buffer_get_text(buffer, &real_start, 
-                                               &iter, FALSE);
 
-               while (!found && i-- > 0) {
-                       found = (strncasecmp(text+i, str, strlen(str)) == 0);
-               }
-                               
-               if (found) {
-                       gtk_text_buffer_get_iter_at_offset(buffer, &start, i);
-                       gtk_text_buffer_get_iter_at_offset(buffer, &end, 
-                                                          i + strlen(str));
+       while (gtk_text_iter_backward_char(&iter)) {
+               pos = gtk_text_iter_get_offset(&iter);
+               if (gtkut_text_buffer_match_string
+                       (buffer, pos, wcs, len, case_sens) == TRUE) {
+                       gtk_text_buffer_get_iter_at_offset(buffer, &iter, pos);
+                       gtk_text_buffer_get_iter_at_offset
+                               (buffer, &end_iter, pos + len);
+                       gtk_text_buffer_select_range(buffer, &iter, &end_iter);
+                       gtk_text_view_scroll_to_mark
+                               (text, mark, 0.0, FALSE, 0.0, 0.0);
+                       found = TRUE;
+                       break;
                }
-               
-               g_free(text);
-       }
-               
-       if (found) {
-               gtk_text_buffer_place_cursor(buffer, &end);
-               gtk_text_buffer_move_mark_by_name(buffer, "selection_bound", 
-                                                 &start);
-               mark = gtk_text_buffer_get_mark(buffer, "insert");
-               gtk_text_view_scroll_mark_onscreen(text, mark);
        }
 
+       g_free(wcs);
        return found;
 }
 
@@ -1606,19 +1571,15 @@ void textview_scroll_one_line(TextView *textview, gboolean up)
        if (!up) {
                upper = vadj->upper - vadj->page_size;
                if (vadj->value < upper) {
-                       vadj->value +=
-                               vadj->step_increment * 4;
-                       vadj->value =
-                               MIN(vadj->value, upper);
+                       vadj->value += vadj->step_increment;
+                       vadj->value = MIN(vadj->value, upper);
                        g_signal_emit_by_name(G_OBJECT(vadj),
                                              "value_changed", 0);
                }
        } else {
                if (vadj->value > 0.0) {
-                       vadj->value -=
-                               vadj->step_increment * 4;
-                       vadj->value =
-                               MAX(vadj->value, 0.0);
+                       vadj->value -= vadj->step_increment;
+                       vadj->value = MAX(vadj->value, 0.0);
                        g_signal_emit_by_name(G_OBJECT(vadj),
                                              "value_changed", 0);
                }
@@ -1702,8 +1663,7 @@ static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
                upper = vadj->upper - vadj->page_size;
                if (vadj->value < upper) {
                        old_value = vadj->value;
-                       last_value = vadj->value +
-                               vadj->step_increment * 4;
+                       last_value = vadj->value + vadj->step_increment;
                        last_value = MIN(last_value, upper);
 
                        textview_smooth_scroll_do(textview, old_value,
@@ -1713,8 +1673,7 @@ static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
        } else {
                if (vadj->value > 0.0) {
                        old_value = vadj->value;
-                       last_value = vadj->value -
-                               vadj->step_increment * 4;
+                       last_value = vadj->value - vadj->step_increment;
                        last_value = MAX(last_value, 0.0);
 
                        textview_smooth_scroll_do(textview, old_value,
@@ -1792,7 +1751,7 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_End:
        case GDK_Control_L:
        case GDK_Control_R:
-               break;
+               return FALSE;
        case GDK_space:
                if (summaryview)
                        summary_pass_key_press_event(summaryview, event);
@@ -2062,19 +2021,12 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                bevent->button == 2 || bevent->button == 3) {
                if (!g_ascii_strncasecmp(uri->uri, "mailto:", 7)) {
                        if (bevent->button == 3) {
-                               gchar *fromname, *fromaddress;
-                                               
-                               /* extract url */
-                               fromaddress = g_strdup(uri->uri + 7);
-                               /* Hiroyuki: please put this function in utils.c! */
-                               fromname = procheader_get_fromname(fromaddress);
-                               extract_address(fromaddress);
-                               g_message("adding from textview %s <%s>", fromname, fromaddress);
-                               /* Add to address book - Match */
-                               addressbook_add_contact( fromname, fromaddress, NULL );
-                                               
-                               g_free(fromaddress);
-                               g_free(fromname);
+                               g_object_set_data(
+                                       G_OBJECT(textview->mail_popup_menu),
+                                       "menu_button", uri);
+                               gtk_menu_popup(GTK_MENU(textview->mail_popup_menu), 
+                                              NULL, NULL, NULL, NULL, 
+                                              bevent->button, bevent->time);
                        } else {
                                PrefsAccount *account = NULL;
 
@@ -2096,9 +2048,9 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                                                 prefs_common.uri_cmd);
                        else if (bevent->button == 3) {
                                g_object_set_data(
-                                       G_OBJECT(textview->popup_menu),
+                                       G_OBJECT(textview->link_popup_menu),
                                        "menu_button", uri);
-                               gtk_menu_popup(GTK_MENU(textview->popup_menu), 
+                               gtk_menu_popup(GTK_MENU(textview->link_popup_menu), 
                                               NULL, NULL, NULL, NULL, 
                                               bevent->button, bevent->time);
                        }
@@ -2158,8 +2110,9 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
                                        "the apparent URL (%s).\n"
                                        "Open it anyway?"),
                                      uri->uri, visible_str);
-               aval = alertpanel_with_type(_("Warning"), msg, _("Yes"), _("No"), NULL,
-                                           NULL, ALERT_WARNING);
+               aval = alertpanel_with_type(_("Warning"), msg,
+                                           GTK_STOCK_YES, GTK_STOCK_NO,
+                                           NULL, NULL, ALERT_WARNING);
                g_free(msg);
                if (aval == G_ALERTDEFAULT)
                        retval = TRUE;
@@ -2186,7 +2139,7 @@ static void textview_uri_list_remove_all(GSList *uri_list)
 
 static void open_uri_cb (TextView *textview, guint action, void *data)
 {
-       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->popup_menu),
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->link_popup_menu),
                                           "menu_button");
        if (uri == NULL)
                return;
@@ -2194,18 +2147,76 @@ static void open_uri_cb (TextView *textview, guint action, void *data)
        if (textview_uri_security_check(textview, uri) == TRUE) 
                open_uri(uri->uri,
                         prefs_common.uri_cmd);
-       g_object_set_data(G_OBJECT(textview->popup_menu), "menu_button",
+       g_object_set_data(G_OBJECT(textview->link_popup_menu), "menu_button",
                          NULL);
 }
 
 static void copy_uri_cb        (TextView *textview, guint action, void *data)
 {
-       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->popup_menu),
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->link_popup_menu),
                                           "menu_button");
        if (uri == NULL)
                return;
 
        gtk_clipboard_set_text(gtk_clipboard_get(GDK_NONE), uri->uri, -1);
-       g_object_set_data(G_OBJECT(textview->popup_menu), "menu_button",
+       g_object_set_data(G_OBJECT(textview->link_popup_menu), "menu_button",
                          NULL);
 }
+
+static void add_uri_to_addrbook_cb (TextView *textview, guint action, void *data)
+{
+       gchar *fromname, *fromaddress;
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
+                                          "menu_button");
+       if (uri == NULL)
+               return;
+
+       /* extract url */
+       fromaddress = g_strdup(uri->uri + 7);
+       /* Hiroyuki: please put this function in utils.c! */
+       fromname = procheader_get_fromname(fromaddress);
+       extract_address(fromaddress);
+       g_message("adding from textview %s <%s>", fromname, fromaddress);
+       /* Add to address book - Match */
+       addressbook_add_contact( fromname, fromaddress, NULL );
+
+       g_free(fromaddress);
+       g_free(fromname);
+}
+
+static void mail_to_uri_cb (TextView *textview, guint action, void *data)
+{
+       PrefsAccount *account = NULL;
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
+                                          "menu_button");
+       if (uri == NULL)
+               return;
+
+       if (textview->messageview && textview->messageview->msginfo &&
+           textview->messageview->msginfo->folder) {
+               FolderItem   *folder_item;
+
+               folder_item = textview->messageview->msginfo->folder;
+               if (folder_item->prefs && folder_item->prefs->enable_default_account)
+                       account = account_find_from_id(folder_item->prefs->default_account);
+       }
+       compose_new(account, uri->uri + 7, NULL);
+}
+
+static void copy_mail_to_uri_cb        (TextView *textview, guint action, void *data)
+{
+       gchar *fromaddress;
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
+                                          "menu_button");
+       if (uri == NULL)
+               return;
+
+       fromaddress = g_strdup(uri->uri + 7);
+       
+       gtk_clipboard_set_text(gtk_clipboard_get(GDK_NONE), fromaddress, -1);
+       g_object_set_data(G_OBJECT(textview->mail_popup_menu), "menu_button",
+                         NULL);
+
+       g_free(fromaddress);
+}
+