/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 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
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktext.h>
#include <gtk/gtksignal.h>
#include <stdio.h>
#include <ctype.h>
#include "procheader.h"
#include "prefs_common.h"
#include "codeconv.h"
+#include "gtkstext.h"
#include "utils.h"
#include "gtkutils.h"
#include "procmime.h"
#include "html.h"
+#include "enriched.h"
#include "compose.h"
#include "addressbook.h"
#include "displayheader.h"
+#include "account.h"
#define FONT_LOAD(font, s) \
{ \
Xstrdup_a(fontstr, s, ); \
if ((p = strchr(fontstr, ',')) != NULL) *p = '\0'; \
font = gdk_font_load(fontstr); \
+ if (!font) \
+ g_warning("Couldn't load the font '%s'\n", fontstr); \
}
typedef struct _RemoteURI RemoteURI;
static GdkFont *spacingfont;
+static void textview_show_ertf (TextView *textview,
+ FILE *fp,
+ CodeConverter *conv);
static void textview_show_html (TextView *textview,
FILE *fp,
CodeConverter *conv);
static void textview_show_header (TextView *textview,
GPtrArray *headers);
-static void textview_key_pressed (GtkWidget *widget,
+static gint textview_key_pressed (GtkWidget *widget,
GdkEventKey *event,
TextView *textview);
-static void textview_button_pressed (GtkWidget *widget,
+static gint textview_button_pressed (GtkWidget *widget,
+ GdkEventButton *event,
+ TextView *textview);
+static gint textview_button_released (GtkWidget *widget,
GdkEventButton *event,
TextView *textview);
gtk_widget_set_usize(scrolledwin_sb, prefs_common.mainview_width, -1);
gtk_widget_set_usize(scrolledwin_mb, prefs_common.mainview_width, -1);
- /* 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;
+ /* create GtkSText widgets for single-byte and multi-byte character */
+ text_sb = gtk_stext_new(NULL, NULL);
+ text_mb = gtk_stext_new(NULL, NULL);
+ GTK_STEXT(text_sb)->default_tab_width = 8;
+ GTK_STEXT(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);
- gtk_text_set_word_wrap(GTK_TEXT(text_mb), TRUE);
+ gtk_stext_set_word_wrap(GTK_STEXT(text_sb), TRUE);
+ gtk_stext_set_word_wrap(GTK_STEXT(text_mb), TRUE);
gtk_widget_ensure_style(text_sb);
gtk_widget_ensure_style(text_mb);
if (text_sb->style && text_sb->style->font->type == GDK_FONT_FONTSET) {
GtkStyle *style;
-
- style = gtk_style_copy(text_sb->style);
- gdk_font_unref(style->font);
- FONT_LOAD(style->font, NORMAL_FONT);
- gtk_widget_set_style(text_sb, style);
+ GdkFont *font;
+
+ FONT_LOAD(font, prefs_common.normalfont);
+ if (font) {
+ style = gtk_style_copy(text_sb->style);
+ gdk_font_unref(style->font);
+ style->font = font;
+ gtk_widget_set_style(text_sb, style);
+ }
}
if (text_mb->style && text_mb->style->font->type == GDK_FONT_FONT) {
GtkStyle *style;
-
- style = gtk_style_copy(text_mb->style);
- gdk_font_unref(style->font);
- style->font = gdk_fontset_load(NORMAL_FONT);
- gtk_widget_set_style(text_mb, style);
+ GdkFont *font;
+
+ font = gdk_fontset_load(prefs_common.normalfont);
+ if (font) {
+ style = gtk_style_copy(text_mb->style);
+ gdk_font_unref(style->font);
+ style->font = font;
+ gtk_widget_set_style(text_mb, style);
+ }
}
gtk_widget_ref(scrolledwin_sb);
gtk_widget_ref(scrolledwin_mb);
gtk_signal_connect_after(GTK_OBJECT(text_sb), "button_press_event",
GTK_SIGNAL_FUNC(textview_button_pressed),
textview);
+ gtk_signal_connect_after(GTK_OBJECT(text_sb), "button_release_event",
+ GTK_SIGNAL_FUNC(textview_button_released),
+ textview);
gtk_signal_connect(GTK_OBJECT(text_mb), "key_press_event",
GTK_SIGNAL_FUNC(textview_key_pressed),
textview);
gtk_signal_connect_after(GTK_OBJECT(text_mb), "button_press_event",
GTK_SIGNAL_FUNC(textview_button_pressed),
textview);
+ gtk_signal_connect_after(GTK_OBJECT(text_mb), "button_release_event",
+ GTK_SIGNAL_FUNC(textview_button_released),
+ textview);
gtk_widget_show(scrolledwin_sb);
gtk_widget_show(scrolledwin_mb);
textview->uri_list = NULL;
textview->body_pos = 0;
textview->cur_pos = 0;
+ textview->last_buttonpress = GDK_NOTHING;
return textview;
}
void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
{
- GtkText *text;
+ GtkSText *text;
gchar buf[BUFFSIZE];
const gchar *boundary = NULL;
gint boundary_len = 0;
boundary_len = strlen(boundary);
}
- if (!boundary && mimeinfo->mime_type == MIME_TEXT) {
+ if (!boundary && (mimeinfo->mime_type == MIME_TEXT || mimeinfo->mime_type == MIME_TEXT_HTML || mimeinfo->mime_type == MIME_TEXT_ENRICHED)) {
+
if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
perror("fseek");
headers = textview_scan_header(textview, fp);
glong fpos;
MimeInfo *parent = mimeinfo->parent;
- while (parent->parent)
+ while (parent->parent) {
+ if (parent->main &&
+ parent->main->mime_type ==
+ MIME_MESSAGE_RFC822)
+ break;
parent = parent->parent;
+ }
if ((fpos = ftell(fp)) < 0)
perror("ftell");
perror("fseek");
}
}
+ /* skip MIME part headers */
while (fgets(buf, sizeof(buf), fp) != NULL)
if (buf[0] == '\r' || buf[0] == '\n') break;
}
conv = conv_code_converter_new(charset);
textview_clear(textview);
- text = GTK_TEXT(textview->text);
- gtk_text_freeze(text);
+ text = GTK_STEXT(textview->text);
+ gtk_stext_freeze(text);
textview->body_pos = 0;
textview->cur_pos = 0;
procheader_header_array_destroy(headers);
}
+/* #if 0 */
tmpfp = procmime_decode_content(NULL, fp, mimeinfo);
+
if (tmpfp) {
if (mimeinfo->mime_type == MIME_TEXT_HTML)
textview_show_html(textview, tmpfp, conv);
+ else if (mimeinfo->mime_type == MIME_TEXT_ENRICHED)
+ textview_show_ertf(textview, tmpfp, conv);
else
while (fgets(buf, sizeof(buf), tmpfp) != NULL)
textview_write_line(textview, buf, conv);
fclose(tmpfp);
}
+/* #else
+ tmpfp = procmime_get_text_content(mimeinfo, fp);
+
+ while (fgets(buf, sizeof(buf), tmpfp) != NULL)
+ textview_write_line(textview, buf, conv);
+
+ fclose(tmpfp);
+#endif */
conv_code_converter_destroy(conv);
- gtk_text_thaw(text);
+ gtk_stext_thaw(text);
}
#define TEXT_INSERT(str) \
- gtk_text_insert(text, textview->msgfont, NULL, NULL, str, -1)
+ gtk_stext_insert(text, textview->msgfont, NULL, NULL, str, -1)
void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
{
- GtkText *text;
+ GtkSText *text;
if (!partinfo) return;
textview_set_font(textview, NULL);
- text = GTK_TEXT(textview->text);
+ text = GTK_STEXT(textview->text);
textview_clear(textview);
- gtk_text_freeze(text);
+ gtk_stext_freeze(text);
TEXT_INSERT(_("To save this part, pop up the context menu with "));
TEXT_INSERT(_("right click and select `Save as...', "));
TEXT_INSERT(_("or double-click, or click the center button, "));
TEXT_INSERT(_("or press `l' key."));
- gtk_text_thaw(text);
+ gtk_stext_thaw(text);
}
#if USE_GPGME
void textview_show_signature_part(TextView *textview, MimeInfo *partinfo)
{
- GtkText *text;
+ GtkSText *text;
if (!partinfo) return;
textview_set_font(textview, NULL);
- text = GTK_TEXT(textview->text);
+ text = GTK_STEXT(textview->text);
textview_clear(textview);
- gtk_text_freeze(text);
+ gtk_stext_freeze(text);
if (partinfo->sigstatus_full == NULL) {
TEXT_INSERT(_("This signature has not been checked yet.\n"));
TEXT_INSERT(partinfo->sigstatus_full);
}
- gtk_text_thaw(text);
+ gtk_stext_thaw(text);
}
#endif /* USE_GPGME */
html_parser_destroy(parser);
}
+static void textview_show_ertf(TextView *textview, FILE *fp,
+ CodeConverter *conv)
+{
+ ERTFParser *parser;
+ gchar *str;
+ gchar* url = NULL;
+
+ parser = ertf_parser_new(fp, conv);
+ g_return_if_fail(parser != NULL);
+
+ while ((str = ertf_parse(parser)) != NULL) {
+ textview_write_line(textview, str, NULL);
+ }
+ ertf_parser_destroy(parser);
+}
+
/* get_uri_part() - retrieves a URI starting from scanpos.
Returns TRUE if succesful */
static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
* should pass some URI type to this function and decide on that whether
* to perform punctuation stripping */
-#define IS_REAL_PUNCT(ch) \
- (ispunct(ch) && ((ch) != '/'))
+#define IS_REAL_PUNCT(ch) (ispunct(ch) && ((ch) != '/'))
for (; ep_ - 1 > scanpos + 1 && IS_REAL_PUNCT(*(ep_ - 1)); ep_--)
;
!isspace(ch) && \
!strchr("()<>\"", (ch)))
+/* alphabet and number within 7bit ASCII */
+#define IS_ASCII_ALNUM(ch) (isascii(ch) && isalnum(ch))
#define IS_QUOTE(ch) ((ch) == '\'' || (ch) == '"')
/* get_email_part() - retrieves an email address. Returns TRUE if succesful */
/* TODO: should start with an alnum? */
bp_++;
- for (; bp_ < scanpos && !isalnum(*bp_); bp_++)
+ for (; bp_ < scanpos && !IS_ASCII_ALNUM(*bp_); bp_++)
;
if (bp_ != scanpos) {
;
/* TODO: really should terminate with an alnum? */
- for (; ep_ > scanpos && !isalnum(*ep_); --ep_)
+ for (; ep_ > scanpos && !IS_ASCII_ALNUM(*ep_); --ep_)
;
ep_++;
last->next = NULL; \
} else { \
g_warning("alloc error scanning URIs\n"); \
- gtk_text_insert(text, textview->msgfont, fg_color, NULL, \
+ gtk_stext_insert(text, textview->msgfont, fg_color, NULL, \
linebuf, -1); \
return; \
}
struct txtpos *next; /* next */
} head = {NULL, NULL, 0, NULL}, *last = &head;
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
/* parse for clickable parts, and build a list of begin and end positions */
for (walk = linebuf, n = 0;;) {
uri = g_new(RemoteURI, 1);
if (last->bp - normal_text > 0)
- gtk_text_insert(text, font,
+ gtk_stext_insert(text, font,
fg_color, NULL,
normal_text,
last->bp - normal_text);
- uri->uri = parser[last->pti].build_uri(last->bp,
+ uri->uri = parser[last->pti].build_uri(last->bp,
last->ep);
- uri->start = gtk_text_get_point(text);
- gtk_text_insert(text, font, uri_color,
+ uri->start = gtk_stext_get_point(text);
+ gtk_stext_insert(text, font, uri_color,
NULL, last->bp, last->ep - last->bp);
- uri->end = gtk_text_get_point(text);
+ uri->end = gtk_stext_get_point(text);
textview->uri_list =
g_slist_append(textview->uri_list, uri);
}
if (*normal_text)
- gtk_text_insert(text, font, fg_color,
+ gtk_stext_insert(text, font, fg_color,
NULL, normal_text, -1);
} else
- gtk_text_insert(text, font, fg_color, NULL, linebuf, -1);
+ gtk_stext_insert(text, font, fg_color, NULL, linebuf, -1);
}
#undef ADD_TXT_POS
{
GdkColor *link_color = NULL;
RemoteURI* uri;
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
gchar buf[BUFFSIZE];
/* this part is taken from textview_write_line. Right now the only place
if (!conv)
strncpy2(buf, str, sizeof(buf));
else if (conv_convert(conv, buf, sizeof(buf), str) < 0) {
- gtk_text_insert(text, textview->msgfont,
+ gtk_stext_insert(text, textview->msgfont,
prefs_common.enable_color
? &error_color : NULL, NULL,
"*** Warning: code conversion failed ***\n",
}
uri = g_new(RemoteURI, 1);
uri->uri = g_strdup(url);
- uri->start = gtk_text_get_point(text);
- gtk_text_insert(text, textview->msgfont, link_color, NULL, buf,
+ uri->start = gtk_stext_get_point(text);
+ gtk_stext_insert(text, textview->msgfont, link_color, NULL, buf,
strlen(buf));
- uri->end = gtk_text_get_point(text);
+ uri->end = gtk_stext_get_point(text);
textview->uri_list = g_slist_append(textview->uri_list, uri);
}
static void textview_write_line(TextView *textview, const gchar *str,
CodeConverter *conv)
{
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
gchar buf[BUFFSIZE];
GdkColor *fg_color;
gint quotelevel = -1;
if (!conv)
strncpy2(buf, str, sizeof(buf));
else if (conv_convert(conv, buf, sizeof(buf), str) < 0) {
- gtk_text_insert(text, textview->msgfont,
+ gtk_stext_insert(text, textview->msgfont,
prefs_common.enable_color
? &error_color : NULL, NULL,
"*** Warning: code conversion failed ***\n",
fg_color = "e_colors[quotelevel];
if (prefs_common.head_space && spacingfont && buf[0] != '\n')
- gtk_text_insert(text, spacingfont, NULL, NULL, " ", 1);
+ gtk_stext_insert(text, spacingfont, NULL, NULL, " ", 1);
if (prefs_common.enable_color)
textview_make_clickable_parts(textview, textview->msgfont,
void textview_clear(TextView *textview)
{
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
- gtk_text_freeze(text);
- gtk_text_set_point(text, 0);
- gtk_text_forward_delete(text, gtk_text_get_length(text));
- gtk_text_thaw(text);
+ gtk_stext_freeze(text);
+ gtk_stext_set_point(text, 0);
+ gtk_stext_forward_delete(text, gtk_stext_get_length(text));
+ gtk_stext_thaw(text);
textview_uri_list_remove_all(textview->uri_list);
textview->uri_list = NULL;
{
gboolean use_fontset = TRUE;
- /* In multi-byte mode, GtkText can't display 8bit characters
+ /* In multi-byte mode, GtkSText can't display 8bit characters
correctly, so it must be single-byte mode. */
if (MB_CUR_MAX > 1) {
if (codeset) {
GtkWidget *parent;
parent = textview->scrolledwin_mb->parent;
- gtk_editable_select_region
- (GTK_EDITABLE(textview->text_mb), 0, 0);
- gtk_container_remove(GTK_CONTAINER(parent),
- textview->scrolledwin_mb);
+ gtkut_container_remove(GTK_CONTAINER(parent),
+ textview->scrolledwin_mb);
gtk_container_add(GTK_CONTAINER(parent),
textview->scrolledwin_sb);
GtkWidget *parent;
parent = textview->scrolledwin_sb->parent;
- gtk_editable_select_region
- (GTK_EDITABLE(textview->text_sb), 0, 0);
- gtk_container_remove(GTK_CONTAINER(parent),
- textview->scrolledwin_sb);
+ gtkut_container_remove(GTK_CONTAINER(parent),
+ textview->scrolledwin_sb);
gtk_container_add(GTK_CONTAINER(parent),
textview->scrolledwin_mb);
{
if (pos < 0) {
textview->cur_pos =
- gtk_text_get_length(GTK_TEXT(textview->text));
+ gtk_stext_get_length(GTK_STEXT(textview->text));
} else {
textview->cur_pos = pos;
}
static void textview_show_header(TextView *textview, GPtrArray *headers)
{
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
Header *header;
gint i;
g_return_if_fail(headers != NULL);
- gtk_text_freeze(text);
+ gtk_stext_freeze(text);
for (i = 0; i < headers->len; i++) {
header = g_ptr_array_index(headers, i);
g_return_if_fail(header->name != NULL);
- gtk_text_insert(text, textview->boldfont, NULL, NULL,
+ gtk_stext_insert(text, textview->boldfont, NULL, NULL,
header->name, -1);
if (header->name[strlen(header->name) - 1] != ' ')
- gtk_text_insert(text, textview->boldfont,
+ gtk_stext_insert(text, textview->boldfont,
NULL, NULL, " ", 1);
if (procheader_headername_equal(header->name, "Subject") ||
procheader_headername_equal(header->name,
"X-Newsreader")) &&
strstr(header->body, "Sylpheed") != NULL)
- gtk_text_insert(text, NULL, &emphasis_color, NULL,
+ gtk_stext_insert(text, NULL, &emphasis_color, NULL,
header->body, -1);
else if (prefs_common.enable_color) {
textview_make_clickable_parts(textview,
NULL, NULL, NULL,
header->body);
}
- gtk_text_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
+ gtk_stext_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
}
- gtk_text_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
- gtk_text_thaw(text);
- textview->body_pos = gtk_text_get_length(text);
+ gtk_stext_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
+ gtk_stext_thaw(text);
+ textview->body_pos = gtk_stext_get_length(text);
}
gboolean textview_search_string(TextView *textview, const gchar *str,
gboolean case_sens)
{
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
gint pos;
wchar_t *wcs;
gint len;
pos = textview->cur_pos;
if (pos < textview->body_pos)
pos = textview->body_pos;
- text_len = gtk_text_get_length(text);
+ text_len = gtk_stext_get_length(text);
if (text_len - pos < len) {
g_free(wcs);
return FALSE;
for (; pos < text_len; pos++) {
if (text_len - pos < len) break;
- if (gtkut_text_match_string(text, pos, wcs, len, case_sens)
+ if (gtkut_stext_match_string(text, pos, wcs, len, case_sens)
== TRUE) {
gtk_editable_set_position(GTK_EDITABLE(text),
pos + len);
gboolean textview_search_string_backward(TextView *textview, const gchar *str,
gboolean case_sens)
{
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
gint pos;
wchar_t *wcs;
gint len;
g_return_val_if_fail(wcs != NULL, FALSE);
len = wcslen(wcs);
pos = textview->cur_pos;
- text_len = gtk_text_get_length(text);
+ text_len = gtk_stext_get_length(text);
if (text_len - textview->body_pos < len) {
g_free(wcs);
return FALSE;
pos = text_len - len;
for (; pos >= textview->body_pos; pos--) {
- if (gtkut_text_match_string(text, pos, wcs, len, case_sens)
+ if (gtkut_stext_match_string(text, pos, wcs, len, case_sens)
== TRUE) {
gtk_editable_set_position(GTK_EDITABLE(text), pos);
gtk_editable_select_region(GTK_EDITABLE(text),
void textview_scroll_one_line(TextView *textview, gboolean up)
{
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
gfloat upper;
if (prefs_common.enable_smooth_scroll) {
gboolean textview_scroll_page(TextView *textview, gboolean up)
{
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
gfloat upper;
gfloat page_incr;
gfloat old_value, gfloat last_value,
gint step)
{
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
gint change_value;
gboolean up;
gint i;
static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
{
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
gfloat upper;
gfloat old_value;
gfloat last_value;
static gboolean textview_smooth_scroll_page(TextView *textview, gboolean up)
{
- GtkText *text = GTK_TEXT(textview->text);
+ GtkSText *text = GTK_STEXT(textview->text);
gfloat upper;
gfloat page_incr;
gfloat old_value;
return TRUE;
}
-static void textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
+#define KEY_PRESS_EVENT_STOP() \
+ if (gtk_signal_n_emissions_by_name \
+ (GTK_OBJECT(widget), "key_press_event") > 0) { \
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), \
+ "key_press_event"); \
+ }
+
+static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
TextView *textview)
{
SummaryView *summaryview = NULL;
+ MessageView *messageview = textview->messageview;
- if (!event) return;
- if (textview->messageview->mainwin)
- summaryview = textview->messageview->mainwin->summaryview;
+ if (!event) return FALSE;
+ if (messageview->mainwin)
+ summaryview = messageview->mainwin->summaryview;
switch (event->keyval) {
case GDK_Tab:
textview_scroll_one_line(textview,
(event->state & GDK_MOD1_MASK) != 0);
break;
+ case GDK_n:
+ case GDK_N:
+ case GDK_p:
+ case GDK_P:
+ case GDK_y:
+ case GDK_t:
+ case GDK_l:
+ if (messageview->type == MVIEW_MIME) {
+ KEY_PRESS_EVENT_STOP();
+ mimeview_pass_key_press_event(messageview->mimeview,
+ event);
+ break;
+ }
+ /* fall through */
default:
if (summaryview)
summary_pass_key_press_event(summaryview, event);
break;
}
+
+ return TRUE;
+}
+
+static gint textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
+ TextView *textview)
+{
+ if (event)
+ textview->last_buttonpress = event->type;
+ return FALSE;
}
-static void textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
+static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
TextView *textview)
{
textview->cur_pos =
gtk_editable_get_position(GTK_EDITABLE(textview->text));
- if (event &&
- ((event->button == 1 && event->type == GDK_2BUTTON_PRESS)
+ if (event &&
+ ((event->button == 1 && textview->last_buttonpress == GDK_2BUTTON_PRESS)
|| event->button == 2 || event->button == 3)) {
GSList *cur;
/* double click seems to set the cursor after the current
* word. The cursor position needs fixing, otherwise the
* last word of a clickable zone will not work */
- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
+ if (event->button == 1 && textview->last_buttonpress == GDK_2BUTTON_PRESS) {
textview->cur_pos--;
}
if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
if (event->button == 3) {
gchar *fromname, *fromaddress;
+ GdkEventButton tmpev;
+
/* 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
+ /* Add to address book - Match */
addressbook_add_contact( fromname, fromaddress, NULL );
+
g_free(fromaddress);
g_free(fromname);
} else {
+ PrefsAccount *account = NULL;
+ FolderItem *folder_item;
+
+ if (textview->messageview && textview->messageview->mainwin
+ && textview->messageview->mainwin->summaryview
+ && textview->messageview->mainwin->summaryview->folder_item) {
+ folder_item = textview->messageview->mainwin->summaryview->folder_item;
+ if (folder_item->prefs && folder_item->prefs->enable_default_account)
+ account = account_find_from_id(folder_item->prefs->default_account);
+ }
compose_new_with_recipient
- (NULL, uri->uri + 7);
+ (account, uri->uri + 7);
}
} else {
open_uri(uri->uri,
}
}
}
+ if (event)
+ textview->last_buttonpress = event->type;
+ return FALSE;
}
static void textview_uri_list_remove_all(GSList *uri_list)