/*
* 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
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkmenu.h>
#include <gtk/gtkcheckmenuitem.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkwidget.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtkctree.h>
#include <gtk/gtkvpaned.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkeditable.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtktreeview.h>
+#include <gtk/gtkliststore.h>
+#include <gtk/gtktreeselection.h>
+#include <gtk/gtktreemodel.h>
#include <gtk/gtkdnd.h>
+#include <gtk/gtkclipboard.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
# include <wctype.h>
#endif
-#include "intl.h"
#include "main.h"
#include "mainwindow.h"
#include "compose.h"
#include "foldersel.h"
#include "toolbar.h"
-typedef enum
+enum
{
COL_MIMETYPE = 0,
COL_SIZE = 1,
- COL_NAME = 2
-} AttachColumnPos;
+ COL_NAME = 2,
+ COL_DATA = 3,
+ COL_AUTODATA = 4,
+ N_COL_COLUMNS
+};
-#define N_ATTACH_COLS 3
+#define N_ATTACH_COLS (N_COL_COLUMNS)
typedef enum
{
gint redo_state,
gpointer data);
-static gint calc_cursor_xpos (GtkTextView *text,
- gint extra,
- gint char_width);
-
static void compose_create_header_entry (Compose *compose);
static void compose_add_header_entry (Compose *compose, gchar *header, gchar *text);
static void compose_update_priority_menu_item(Compose * compose);
GtkSHRuler *shruler);
static void account_activated (GtkMenuItem *menuitem,
gpointer data);
-static void attach_selected (GtkCList *clist,
- gint row,
- gint column,
- GdkEvent *event,
- gpointer data);
+static void attach_selected (GtkTreeView *tree_view,
+ GtkTreePath *tree_path,
+ GtkTreeViewColumn *column,
+ Compose *compose);
static gboolean attach_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
static void compose_advanced_action_cb (Compose *compose,
ComposeCallAdvancedAction action);
-static gboolean compose_grab_focus_cb (GtkWidget *widget,
+static void compose_grab_focus_cb (GtkWidget *widget,
Compose *compose);
-static gboolean compose_grab_focus_before_cb (GtkWidget *widget,
+static void compose_grab_focus_before_cb(GtkWidget *widget,
Compose *compose);
static void compose_changed_cb (GtkTextBuffer *textbuf,
static void compose_toggle_encrypt_cb (gpointer data,
guint action,
GtkWidget *widget);
-static void compose_set_privacy_system_cb(gpointer data,
- guint action,
- GtkWidget *widget);
+static void compose_set_privacy_system_cb(GtkWidget *widget,
+ gpointer data);
static void compose_update_privacy_system_menu_item(Compose * compose);
static void activate_privacy_system (Compose *compose,
PrefsAccount *account);
guint info,
guint time,
gpointer user_data);
+static void compose_header_drag_received_cb (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
+ gpointer user_data);
+static gboolean compose_drag_drop (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x, gint y,
+ guint time, gpointer user_data);
#if 0
static void to_activated (GtkWidget *widget,
Compose *compose);
Compose *compose);
#endif
-static void text_activated (GtkWidget *widget,
- Compose *compose);
static void text_inserted (GtkTextBuffer *buffer,
GtkTextIter *iter,
const gchar *text,
static void compose_check_forwards_go (Compose *compose);
#endif
-static gboolean compose_send_control_enter (Compose *compose);
static gint compose_defer_auto_save_draft (Compose *compose);
static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo);
+static void compose_close (Compose *compose);
+
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_Add..."), NULL, compose_attach_cb, 0, NULL},
#endif
{N_("/_Options"), NULL, NULL, 0, "<Branch>"},
{N_("/_Options/Privacy System"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Privacy System/None"), NULL, compose_set_privacy_system_cb, 0, "<RadioItem>"},
+ {N_("/_Options/Privacy System/None"), NULL, NULL, 0, "<RadioItem>"},
{N_("/_Options/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
{N_("/_Options/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
{N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
static GtkTargetEntry compose_mime_types[] =
{
- {"text/uri-list", 0, 0}
+ {"text/uri-list", 0, 0},
+ {"text/plain", 0, 0},
+ {"STRING", 0, 0}
};
+static gboolean compose_put_existing_to_front(MsgInfo *info)
+{
+ GList *compose_list = compose_get_compose_list();
+ GList *elem = NULL;
+
+ if (compose_list) {
+ for (elem = compose_list; elem != NULL && elem->data != NULL;
+ elem = elem->next) {
+ Compose *c = (Compose*)elem->data;
+
+ if (!c->targetinfo || !c->targetinfo->msgid ||
+ !info->msgid)
+ continue;
+
+ if (!strcmp(c->targetinfo->msgid, info->msgid)) {
+ gtkut_window_popup(c->window);
+ return TRUE;
+ }
+ }
+ }
+ return FALSE;
+}
+
Compose *compose_new(PrefsAccount *account, const gchar *mailto,
GPtrArray *attach_files)
{
if (account->auto_sig)
compose_insert_sig(compose, FALSE);
- if (quote && prefs_common.linewrap_quote)
- compose_wrap_line_all(compose);
-
cursor_pos = quote_fmt_get_cursor_pos();
gtk_text_buffer_get_start_iter(textbuf, &iter);
gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cursor_pos);
gtk_text_buffer_place_cursor(textbuf, &iter);
-
- if (quote && prefs_common.linewrap_quote) {
+
+ if (quote && prefs_common.linewrap_quote)
compose_wrap_line_all(compose);
- gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), TRUE);
- }
gtk_widget_grab_focus(compose->text);
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
+ if (compose_put_existing_to_front(msginfo))
+ return;
+
if (msginfo->folder->stype == F_QUEUE || msginfo->folder->stype == F_DRAFT) {
gchar queueheader_buf[BUFFSIZE];
gint id, param;
G_CALLBACK(compose_changed_cb),
compose);
- g_signal_handlers_block_by_func(G_OBJECT(textbuf),
- G_CALLBACK(text_inserted),
- compose);
-
if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
g_warning("Can't get text part\n");
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
gtk_text_buffer_insert(textbuf, &iter, buf, -1);
- gtk_text_buffer_get_iter_at_mark(textbuf, &iter, mark);
}
fclose(fp);
}
compose_attach_parts(compose, msginfo);
- g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
- G_CALLBACK(text_inserted),
- compose);
g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
G_CALLBACK(compose_changed_cb),
compose);
gtk_widget_grab_focus(compose->header_last->entry);
- filename = procmsg_get_message_file(msginfo);
+ filename = procmsg_get_message_file_path(msginfo);
if (filename == NULL)
return NULL;
gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
compose_quote_fmt(compose, msginfo, "%M", NULL, NULL);
- gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), TRUE);
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
ifactory = gtk_item_factory_from_widget(compose->popupmenu);
menu_set_sensitive(ifactory, "/Add...", FALSE);
menu_set_sensitive(ifactory, "/Remove", FALSE);
- menu_set_sensitive(ifactory, "/Property...", FALSE);
+ menu_set_sensitive(ifactory, "/Properties...", FALSE);
ifactory = gtk_item_factory_from_widget(compose->menubar);
menu_set_sensitive(ifactory, "/Message/Save", FALSE);
menu_set_sensitive(ifactory, "/Message/Attach file", FALSE);
menu_set_sensitive(ifactory, "/Message/Insert signature", FALSE);
menu_set_sensitive(ifactory, "/Edit", FALSE);
- menu_set_sensitive(ifactory, "/Options/Sign", FALSE);
- menu_set_sensitive(ifactory, "/Options/Encrypt", FALSE);
- menu_set_sensitive(ifactory, "/Options/Priority", FALSE);
- menu_set_sensitive(ifactory, "/Options/Request Return Receipt", FALSE);
+ menu_set_sensitive(ifactory, "/Options", FALSE);
menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
gchar *bcc = NULL;
gchar *subject = NULL;
gchar *body = NULL;
+ gchar *temp = NULL;
+ gint len = 0;
scan_mailto_url(mailto, &to, &cc, &bcc, &subject, &body);
if (bcc)
compose_entry_append(compose, bcc, COMPOSE_BCC);
if (subject)
- gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), subject);
+ if (!g_utf8_validate (subject, -1, NULL)) {
+ temp = g_locale_to_utf8 (subject, -1, NULL, &len, NULL);
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), temp);
+ g_free(temp);
+ } else {
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), subject);
+ }
if (body) {
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
- gtk_text_buffer_insert(buffer, &iter, body, -1);
+ if (!g_utf8_validate (body, -1, NULL)) {
+ temp = g_locale_to_utf8 (body, -1, NULL, &len, NULL);
+ gtk_text_buffer_insert(buffer, &iter, temp, -1);
+ g_free(temp);
+ } else {
+ gtk_text_buffer_insert(buffer, &iter, body, -1);
+ }
gtk_text_buffer_insert(buffer, &iter, "\n", 1);
}
GtkTextBuffer *buffer;
GtkTextMark *mark;
GtkTextIter iter;
+ const gchar *cur_encoding;
gchar buf[BUFFSIZE];
gint len;
FILE *fp;
G_CALLBACK(text_inserted),
compose);
+ cur_encoding = conv_get_locale_charset_str();
+
while (fgets(buf, sizeof(buf), fp) != NULL) {
- const gchar *cur_encoding = conv_get_current_charset_str();
- gchar *str = NULL;
- if (!g_utf8_validate(buf, -1, NULL))
- str = conv_codeset_strdup(buf, cur_encoding, CS_UTF_8);
- else
- str = g_strdup(buf);
+ gchar *str;
+ str = conv_codeset_strdup(buf, cur_encoding, CS_INTERNAL);
if (!str) continue;
/* strip <CR> if DOS/Windows file,
while (--len >= 0)
if (str[len] == '\r') str[len] = '\n';
}
- gtk_text_buffer_insert(buffer, &iter, str, -1);
- g_free (str);
+ gtk_text_buffer_insert(buffer, &iter, str, -1);
+ g_free(str);
}
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
const gchar *content_type)
{
AttachInfo *ainfo;
- gchar *text[N_ATTACH_COLS];
+ GtkTreeIter iter;
FILE *fp;
off_t size;
- gint row;
+ GAuto *auto_ainfo;
+ gchar *size_text;
+ GtkListStore *store;
gchar *name;
if (!is_file_exist(file)) {
}
#endif
ainfo = g_new0(AttachInfo, 1);
+ auto_ainfo = g_auto_pointer_new_with_free
+ (ainfo, (GFreeFunc) compose_attach_info_free);
ainfo->file = g_strdup(file);
if (content_type) {
msginfo = procheader_parse_file(file, flags, FALSE, FALSE);
if (msginfo && msginfo->subject)
- name = msginfo->subject;
+ name = g_strdup(msginfo->subject);
else
name = g_path_get_basename(filename ? filename : file);
}
ainfo->size = size;
+ size_text = to_human_readable(size);
- text[COL_MIMETYPE] = ainfo->content_type;
- text[COL_SIZE] = to_human_readable(size);
- text[COL_NAME] = ainfo->name;
-
- row = gtk_clist_append(GTK_CLIST(compose->attach_clist), text);
- gtk_clist_set_row_data(GTK_CLIST(compose->attach_clist), row, ainfo);
+ store = GTK_LIST_STORE(gtk_tree_view_get_model
+ (GTK_TREE_VIEW(compose->attach_clist)));
+
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ COL_MIMETYPE, ainfo->content_type,
+ COL_SIZE, size_text,
+ COL_NAME, ainfo->name,
+ COL_DATA, ainfo,
+ COL_AUTODATA, auto_ainfo,
+ -1);
+
+ g_auto_pointer_free(auto_ainfo);
}
static void compose_use_signing(Compose *compose, gboolean use_signing)
#define CHAR_BUF_SIZE 8
#undef NEXT_PART_NOT_CHILD
-#define GET_CHAR(iter_p, buf, len) \
-{ \
- GtkTextIter end_iter; \
- gchar *tmp; \
- end_iter = *iter_p; \
- gtk_text_iter_forward_char(&end_iter); \
- tmp = gtk_text_buffer_get_text(textbuf, iter_p, &end_iter, FALSE); \
- if (tmp) { \
- glong items_read, items_witten; \
- GError *error = NULL; \
- gunichar *wide_char; \
- strncpy2(buf, tmp, CHAR_BUF_SIZE); \
- wide_char = g_utf8_to_ucs4(tmp, -1, \
- &items_read, &items_witten, \
- &error); \
- if (error != NULL) { \
- g_warning("%s\n", error->message); \
- g_error_free(error); \
- } \
- len = wide_char && g_unichar_iswide(*wide_char) ? 2 : 1; \
- g_free(wide_char); \
- } else { \
- buf[0] = '\0'; \
- len = 1; \
- } \
- g_free(tmp); \
-}
+#define GET_CHAR(iter_p, buf, len) \
+{ \
+ gunichar uc; \
+ \
+ uc = gtk_text_iter_get_char(iter_p); \
+ if (uc != 0) { \
+ len = g_unichar_to_utf8(uc, buf) > 1 ? 2 : 1; \
+ buf[len]='\0'; \
+ } else { \
+ buf[0] = '\0'; \
+ len = 1; \
+ } \
+}
#define DISP_WIDTH(len) \
- ((len > 2 && conv_get_current_charset() == C_UTF_8) ? 2 : \
- (len == 2 && conv_get_current_charset() == C_UTF_8) ? 1 : len)
+ ((len > 2) ? 2 : \
+ (len == 2) ? 1 : len)
#define SPACE_CHARS " \t"
if (space) {
line_pos = cur_pos + 1;
- line_len = cur_len + ch_len;
+ line_len = cur_len + DISP_WIDTH(ch_len);
}
gtk_text_buffer_get_iter_at_offset(textbuf, &iter, line_pos);
p_end++;
cur_pos++;
line_pos++;
- cur_len = cur_len - line_len + ch_len;
+ cur_len = cur_len - line_len + DISP_WIDTH(ch_len);
line_len = 0;
continue;
}
- if (ch_len > 1) {
- line_pos = cur_pos + 1;
- line_len = cur_len + ch_len;
- }
- cur_len += ch_len;
+ cur_len += DISP_WIDTH(ch_len);
}
}
#undef WRAP_DEBUG
#ifdef WRAP_DEBUG
/* Darko: used when I debug wrapping */
-void dump_text(GtkTextBuffer textbuf, int pos, int tlen, int breakoncr)
+void dump_text(GtkTextBuffer *textbuf, int pos, int tlen, int breakoncr)
{
- gint i, clen;
+ GtkTextIter iter, end_iter;
+ gint clen;
gchar cbuf[CHAR_BUF_SIZE];
printf("%d [", pos);
gtk_text_buffer_get_iter_at_offset(textbuf, &iter, pos);
gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter, pos + tlen);
for (; gtk_text_iter_forward_char(&iter) &&
- gtk_text_iter_compare(&iter, &end_iter) < 0;)
+ gtk_text_iter_compare(&iter, &end_iter) < 0; ) {
GET_CHAR(&iter, cbuf, clen);
if (clen < 0) break;
if (breakoncr && clen == 1 && cbuf[0] == '\n')
uppercase characters immediately followed by >,
and the repeating sequences of the above */
/* return indent length */
-static guint get_indent_length(GtkTextBuffer *textbuf, guint start_pos, guint text_len)
+static guint get_indent_length(GtkTextBuffer *textbuf, guint start_pos,
+ guint text_len)
{
+ GtkTextIter iter;
guint i_len = 0;
- guint i, ch_len, alnum_cnt = 0;
+ guint ch_len, alnum_cnt = 0;
IndentState state = WAIT_FOR_INDENT_CHAR;
gchar cbuf[CHAR_BUF_SIZE];
gboolean is_space;
gboolean is_indent;
+ gboolean iter_next = TRUE;
if (prefs_common.quote_chars == NULL) {
return 0 ;
}
- for (i = start_pos; i < text_len; i++) {
- GtkTextIter iter;
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, start_pos);
- gtk_text_buffer_get_iter_at_offset(textbuf, &iter, i);
+ while (iter_next == TRUE) {
GET_CHAR(&iter, cbuf, ch_len);
if (ch_len > 1)
break;
}
i_len++;
+ iter_next = gtk_text_iter_forward_char(&iter);
}
out:
gint ch_len;
gboolean is_new_line = TRUE, do_delete = FALSE;
guint i_len = 0;
- gboolean linewrap_quote = TRUE;
+ gboolean linewrap_quote = prefs_common.linewrap_quote;
gboolean set_editable_pos = FALSE;
gint editable_pos = 0;
guint linewrap_len = prefs_common.linewrap_len;
is_new_line = TRUE;
#ifdef WRAP_DEBUG
g_print("after delete l_pos=");
- dump_text(text, line_pos, tlen, 1);
+ dump_text(textbuf, line_pos, tlen, 1);
#endif
/* move beginning of line if we are on LF */
gtk_text_buffer_get_iter_at_offset(textbuf,
/* possible line break */
if (ch_len == 1 && isspace(*(guchar *)cbuf)) {
line_pos = cur_pos + 1;
- line_len = cur_len + ch_len;
+ line_len = cur_len + DISP_WIDTH(ch_len);
}
/* are we over wrapping length set in preferences ? */
#ifdef WRAP_DEBUG
g_print("should wrap cur_pos=%d ", cur_pos);
- dump_text(text, p_pos, tlen, 1);
- dump_text(text, line_pos, tlen, 1);
+ dump_text(textbuf, p_pos, tlen, 1);
+ dump_text(textbuf, line_pos, tlen, 1);
#endif
/* force wrapping if it is one long word but not URL */
if (line_pos - p_pos <= i_len)
gtkut_text_buffer_is_uri_string(textbuf, line_pos, tlen)) {
#ifdef WRAP_DEBUG
g_print("found URL at ");
- dump_text(text, line_pos, tlen, 1);
+ dump_text(textbuf, line_pos, tlen, 1);
#endif
continue;
}
do_delete = FALSE;
#ifdef WRAP_DEBUG
g_print("after CR insert ");
- dump_text(text, line_pos, tlen, 1);
- dump_text(text, cur_pos, tlen, 1);
+ dump_text(textbuf, line_pos, tlen, 1);
+ dump_text(textbuf, cur_pos, tlen, 1);
#endif
/* should we insert quotation ? */
}
#ifdef WRAP_DEBUG
g_print("after quote insert ");
- dump_text(text, line_pos, tlen, 1);
+ dump_text(textbuf, line_pos, tlen, 1);
#endif
}
}
continue;
}
- if (ch_len > 1) {
- line_pos = cur_pos + 1;
- line_len = cur_len + ch_len;
- }
/* advance to next character in buffer */
- cur_len += ch_len;
+ cur_len += DISP_WIDTH(ch_len);
}
if (set_editable_pos && editable_pos <= tlen) {
#endif
- if (account->default_sign)
+ if (account->default_sign && compose->mode != COMPOSE_REDIRECT)
menu_set_active(ifactory, "/Options/Sign", TRUE);
else
menu_set_active(ifactory, "/Options/Sign", FALSE);
- if (account->default_encrypt)
+ if (account->default_encrypt && compose->mode != COMPOSE_REDIRECT)
menu_set_active(ifactory, "/Options/Encrypt", TRUE);
else
menu_set_active(ifactory, "/Options/Encrypt", FALSE);
aval = alertpanel(_("Send"),
_("Subject is empty. Send it anyway?"),
- _("Yes"), _("No"), NULL);
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
if (aval != G_ALERTDEFAULT)
return FALSE;
}
if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS) {
compose->sending = FALSE;
- gtk_widget_destroy(compose->window);
+ compose_close(compose);
/* No more compose access in the normal codepath
* after this point! */
}
folder_item_remove_msg(folder, msgnum);
folder_item_scan(folder);
if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS)
- gtk_widget_destroy(compose->window);
+ compose_close(compose);
} else {
alertpanel_error(_("The message was queued but could not be "
"sent.\nUse \"Send queued messages\" from "
static gboolean compose_use_attach(Compose *compose)
{
- return gtk_clist_get_row_data(GTK_CLIST(compose->attach_clist), 0) != NULL;
+ GtkTreeModel *model = gtk_tree_view_get_model
+ (GTK_TREE_VIEW(compose->attach_clist));
+ return gtk_tree_model_iter_n_children(model, NULL) > 0;
}
static gint compose_redirect_write_headers_from_headerlist(Compose *compose,
/* Resent-Message-ID */
if (compose->account->gen_msgid) {
- generate_msgid(compose->account->address, buf, sizeof(buf));
+ generate_msgid(buf, sizeof(buf));
fprintf(fp, "Resent-Message-ID: <%s>\n", buf);
compose->msgid = g_strdup(buf);
}
else
encoding = procmime_get_encoding_for_charset(out_codeset);
- src_codeset = CS_UTF_8;
+ src_codeset = CS_INTERNAL;
/* if current encoding is US-ASCII, set it the same as
outgoing one to prevent code conversion failure */
if (!g_ascii_strcasecmp(src_codeset, CS_US_ASCII))
if (action == COMPOSE_WRITE_FOR_SEND) {
buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
+
if (!buf) {
AlertValue aval;
gchar *msg;
}
g_free(chars);
+ if (encoding == ENC_8BIT || encoding == ENC_7BIT) {
+ if (!strncmp(buf, "From ", sizeof("From ")-1) ||
+ strstr(buf, "\nFrom ") != NULL) {
+ encoding = ENC_QUOTED_PRINTABLE;
+ }
+ }
+
mimetext = procmime_mimeinfo_new();
mimetext->content = MIMECONTENT_MEM;
mimetext->data.mem = buf;
mimetext->subtype = g_strdup("plain");
g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
g_strdup(out_codeset));
+ /* protect trailing spaces when signing message */
+ if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
+ privacy_system_can_sign(compose->privacy_system))
+ if (encoding == ENC_7BIT)
+ encoding = ENC_QUOTED_PRINTABLE;
+ else if (encoding == ENC_8BIT)
+ encoding = ENC_BASE64;
if (encoding != ENC_UNKNOWN)
procmime_encode_content(mimetext, encoding);
/* sign message if sending */
if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
privacy_system_can_sign(compose->privacy_system))
- if (!privacy_sign(compose->privacy_system, mimemsg))
+ if (!privacy_sign(compose->privacy_system, mimemsg, compose->account))
return -1;
procmime_write_mimeinfo(mimemsg, fp);
gtk_text_buffer_get_end_iter(buffer, &end);
tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
- src_codeset = CS_UTF_8;
- dest_codeset = conv_get_current_charset_str();
- chars = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
+ chars = conv_codeset_strdup
+ (tmp, CS_INTERNAL, conv_get_locale_charset_str());
+
g_free(tmp);
if (!chars) return -1;
static void compose_add_attachments(Compose *compose, MimeInfo *parent)
{
AttachInfo *ainfo;
- GtkCList *clist = GTK_CLIST(compose->attach_clist);
- gint row;
+ GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
MimeInfo *mimepart;
struct stat statbuf;
gchar *type, *subtype;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
- for (row = 0; (ainfo = gtk_clist_get_row_data(clist, row)) != NULL;
- row++) {
+ model = gtk_tree_view_get_model(tree_view);
+
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ return;
+ do {
+ gtk_tree_model_get(model, &iter,
+ COL_DATA, &ainfo,
+ -1);
+
mimepart = procmime_mimeinfo_new();
mimepart->content = MIMECONTENT_FILE;
mimepart->data.filename = g_strdup(ainfo->file);
procmime_encode_content(mimepart, ainfo->encoding);
g_node_append(parent->node, mimepart->node);
- }
+ } while (gtk_tree_model_iter_next(model, &iter));
}
#define QUOTE_IF_REQUIRED(out, str) \
/* Message-ID */
if (compose->account->gen_msgid) {
- generate_msgid(compose->account->address, buf, sizeof(buf));
+ generate_msgid(buf, sizeof(buf));
g_string_append_printf(header, "Message-ID: <%s>\n", buf);
compose->msgid = g_strdup(buf);
}
g_signal_connect(G_OBJECT(entry), "changed",
G_CALLBACK(compose_headerentry_changed_cb),
headerentry);
- g_signal_connect(G_OBJECT(entry), "activate",
- G_CALLBACK(text_activated), compose);
g_signal_connect(G_OBJECT(entry), "grab_focus",
G_CALLBACK(compose_grab_focus_before_cb), compose);
g_signal_connect_after(G_OBJECT(entry), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
+
+ /* email dnd */
+ gtk_drag_dest_set(entry, GTK_DEST_DEFAULT_ALL, compose_mime_types,
+ sizeof(compose_mime_types)/sizeof(compose_mime_types[0]),
+ GDK_ACTION_COPY | GDK_ACTION_MOVE);
+ g_signal_connect(G_OBJECT(entry), "drag_data_received",
+ G_CALLBACK(compose_header_drag_received_cb),
+ entry);
+ g_signal_connect(G_OBJECT(entry), "drag-drop",
+ G_CALLBACK(compose_drag_drop),
+ compose);
+
address_completion_register_entry(GTK_ENTRY(entry));
headerentry->compose = compose;
GtkWidget *compose_create_attach(Compose *compose)
{
- gchar *titles[N_ATTACH_COLS];
- gint i;
-
GtkWidget *attach_scrwin;
GtkWidget *attach_clist;
- titles[COL_MIMETYPE] = _("MIME type");
- titles[COL_SIZE] = _("Size");
- titles[COL_NAME] = _("Name");
+ GtkListStore *store;
+ GtkCellRenderer *renderer;
+ GtkTreeViewColumn *column;
+ GtkTreeSelection *selection;
/* attachment list */
attach_scrwin = gtk_scrolled_window_new(NULL, NULL);
GTK_POLICY_AUTOMATIC);
gtk_widget_set_size_request(attach_scrwin, -1, 80);
- attach_clist = gtk_clist_new_with_titles(N_ATTACH_COLS, titles);
- gtk_clist_set_column_justification(GTK_CLIST(attach_clist), COL_SIZE,
- GTK_JUSTIFY_RIGHT);
- gtk_clist_set_column_width(GTK_CLIST(attach_clist), COL_MIMETYPE, 240);
- gtk_clist_set_column_width(GTK_CLIST(attach_clist), COL_SIZE, 64);
- gtk_clist_set_selection_mode(GTK_CLIST(attach_clist),
- GTK_SELECTION_EXTENDED);
- for (i = 0; i < N_ATTACH_COLS; i++)
- GTK_WIDGET_UNSET_FLAGS
- (GTK_CLIST(attach_clist)->column[i].button,
- GTK_CAN_FOCUS);
+ store = gtk_list_store_new(N_ATTACH_COLS,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_POINTER,
+ G_TYPE_AUTO_POINTER,
+ -1);
+ attach_clist = GTK_WIDGET(gtk_tree_view_new_with_model
+ (GTK_TREE_MODEL(store)));
gtk_container_add(GTK_CONTAINER(attach_scrwin), attach_clist);
+ g_object_unref(store);
+
+ renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Mime type"), renderer, "text",
+ COL_MIMETYPE, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
+
+ renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Size"), renderer, "text",
+ COL_SIZE, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
+
+ renderer = gtk_cell_renderer_text_new();
+ column = gtk_tree_view_column_new_with_attributes
+ (_("Name"), renderer, "text",
+ COL_NAME, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(attach_clist), column);
+
+ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(attach_clist), TRUE);
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(attach_clist));
+ gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
- g_signal_connect(G_OBJECT(attach_clist), "select_row",
+ g_signal_connect(G_OBJECT(attach_clist), "row_activated",
G_CALLBACK(attach_selected), compose);
g_signal_connect(G_OBJECT(attach_clist), "button_press_event",
G_CALLBACK(attach_button_pressed), compose);
/* drag and drop */
gtk_drag_dest_set(attach_clist,
- GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
+ GTK_DEST_DEFAULT_ALL, compose_mime_types,
+ sizeof(compose_mime_types)/sizeof(compose_mime_types[0]),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
g_signal_connect(G_OBJECT(attach_clist), "drag_data_received",
G_CALLBACK(compose_attach_drag_received_cb),
compose);
+ g_signal_connect(G_OBJECT(attach_clist), "drag-drop",
+ G_CALLBACK(compose_drag_drop),
+ compose);
compose->attach_scrwin = attach_scrwin;
compose->attach_clist = attach_clist;
gchar *titles[N_ATTACH_COLS];
guint n_menu_entries;
- GtkStyle *style, *new_style;
GdkColormap *cmap;
GdkColor color[1];
gboolean success[1];
GtkItemFactory *ifactory;
GtkWidget *tmpl_menu;
gint n_entries;
+ GtkWidget *menuitem;
#if USE_ASPELL
GtkAspell * gtkaspell = NULL;
subject_entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 2);
- g_signal_connect(G_OBJECT(subject_entry), "activate",
- G_CALLBACK(text_activated), compose);
g_signal_connect(G_OBJECT(subject_entry), "grab_focus",
G_CALLBACK(compose_grab_focus_before_cb), compose);
g_signal_connect_after(G_OBJECT(subject_entry), "grab_focus",
ruler = gtk_shruler_new();
gtk_ruler_set_range(GTK_RULER(ruler), 0.0, 100.0, 1.0, 100.0);
gtk_box_pack_start(GTK_BOX(ruler_hbox), ruler, TRUE, TRUE,
- BORDER_WIDTH + 1);
- gtk_widget_set_size_request(ruler_hbox, 1, -1);
+ BORDER_WIDTH);
/* text widget */
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+ GTK_SHADOW_IN);
gtk_box_pack_start(GTK_BOX(edit_vbox), scrolledwin, TRUE, TRUE, 0);
gtk_widget_set_size_request(scrolledwin, prefs_common.compose_width, -1);
G_CALLBACK(compose_changed_cb), compose);
g_signal_connect(G_OBJECT(text), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
- g_signal_connect(G_OBJECT(buffer), "insert-text",
+ g_signal_connect(G_OBJECT(buffer), "insert_text",
G_CALLBACK(text_inserted), compose);
/* drag and drop */
- gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
+ gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types,
+ sizeof(compose_mime_types)/sizeof(compose_mime_types[0]),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
g_signal_connect(G_OBJECT(text), "drag_data_received",
G_CALLBACK(compose_insert_drag_received_cb),
compose);
+ g_signal_connect(G_OBJECT(text), "drag-drop",
+ G_CALLBACK(compose_drag_drop),
+ compose);
gtk_widget_show_all(vbox);
/* pane between attach clist and text */
gtk_paned_add2(GTK_PANED(paned), edit_vbox);
gtk_widget_show_all(paned);
- style = gtk_widget_get_style(text);
-
- new_style = gtk_style_copy(style);
if (prefs_common.textfont) {
PangoFontDescription *font_desc;
font_desc = pango_font_description_from_string
- (prefs_common.textfont);
+ (prefs_common.textfont);
if (font_desc) {
- if (new_style->font_desc)
- pango_font_description_free
- (new_style->font_desc);
- new_style->font_desc = font_desc;
+ gtk_widget_modify_font(text, font_desc);
+ pango_font_description_free(font_desc);
}
}
- gtk_widget_set_style(text, new_style);
-
color[0] = quote_color;
cmap = gdk_window_get_colormap(window->window);
gdk_colormap_alloc_colors(cmap, color, 1, FALSE, TRUE, success);
if (success[0] == FALSE) {
+ GtkStyle *style;
+
g_warning("Compose: color allocation failed.\n");
style = gtk_widget_get_style(text);
quote_color = style->black;
strcmp(prefs_common.dictionary, _("None"))) {
gtkaspell = gtkaspell_new(prefs_common.aspell_path,
prefs_common.dictionary,
- conv_get_current_charset_str(),
+ conv_get_locale_charset_str(),
prefs_common.misspelled_col,
prefs_common.check_while_typing,
prefs_common.use_alternate,
if (mode != COMPOSE_REDIRECT)
compose_set_template_menu(compose);
else {
- GtkWidget *menuitem;
menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Template");
menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
}
if (!prefs_common.show_ruler)
gtk_widget_hide(ruler_hbox);
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Show ruler");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ prefs_common.show_ruler);
/* Priority */
compose->priority = PRIORITY_NORMAL;
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
-static void compose_set_privacy_system_cb(gpointer data,
- guint action,
- GtkWidget *widget)
+static void compose_set_privacy_system_cb(GtkWidget *widget, gpointer data)
{
Compose *compose = (Compose *) data;
gchar *systemid;
GtkItemFactory *ifactory;
gboolean can_sign = FALSE, can_encrypt = FALSE;
+ g_return_if_fail(GTK_IS_CHECK_MENU_ITEM(widget));
+
+ if (!GTK_CHECK_MENU_ITEM(widget)->active)
+ return;
+
systemid = g_object_get_data(G_OBJECT(widget), "privacy_system");
g_free(compose->privacy_system);
compose->privacy_system = NULL;
can_encrypt = privacy_system_can_encrypt(systemid);
}
+ debug_print("activated privacy system: %s\n", systemid != NULL ? systemid : "None");
+
ifactory = gtk_item_factory_from_widget(compose->menubar);
menu_set_sensitive(ifactory, "/Options/Sign", can_sign);
menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
void compose_update_privacy_systems_menu(Compose *compose)
{
static gchar *branch_path = "/Options/Privacy System";
+ static gboolean connected = FALSE;
GtkItemFactory *ifactory;
GtkWidget *menuitem;
- gchar *menu_path;
GSList *systems, *cur;
GList *amenu;
- GtkItemFactoryEntry ifentry = {NULL, NULL, NULL, 0, "<Branch>"};
GtkWidget *widget;
+ GtkWidget *system_none;
+ GSList *group;
ifactory = gtk_item_factory_from_widget(compose->menubar);
/* remove old entries */
- ifentry.path = branch_path;
menuitem = gtk_item_factory_get_widget(ifactory, branch_path);
g_return_if_fail(menuitem != NULL);
amenu = alist;
}
- ifentry.accelerator = NULL;
- ifentry.callback_action = 0;
- ifentry.callback = compose_set_privacy_system_cb;
- ifentry.item_type = "/Options/Privacy System/None";
+ system_none = gtk_item_factory_get_widget(ifactory,
+ "/Options/Privacy System/None");
+ if (!connected) {
+ g_signal_connect(G_OBJECT(system_none), "activate",
+ G_CALLBACK(compose_set_privacy_system_cb), compose);
+ connected = TRUE;
+ }
systems = privacy_get_system_ids();
for (cur = systems; cur != NULL; cur = g_slist_next(cur)) {
gchar *systemid = cur->data;
- menu_path = g_strdup_printf("%s/%s", branch_path,
- privacy_system_get_name(systemid));
- ifentry.path = menu_path;
- gtk_item_factory_create_item(ifactory, &ifentry, compose, 1);
- widget = gtk_item_factory_get_widget(ifactory, menu_path);
-
+ group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(system_none));
+ widget = gtk_radio_menu_item_new_with_label(group,
+ privacy_system_get_name(systemid));
g_object_set_data_full(G_OBJECT(widget), "privacy_system",
g_strdup(systemid), g_free);
+ g_signal_connect(G_OBJECT(widget), "activate",
+ G_CALLBACK(compose_set_privacy_system_cb), compose);
+ gtk_menu_append(GTK_MENU(system_none->parent), widget);
+ gtk_widget_show(widget);
g_free(systemid);
- g_free(menu_path);
}
g_slist_free(systems);
}
compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
if (replace)
- gtk_text_buffer_set_text(buffer, "\0", 1);
+ gtk_text_buffer_set_text(buffer, "", -1);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
static void compose_destroy(Compose *compose)
{
- gint row;
- GtkCList *clist = GTK_CLIST(compose->attach_clist);
- AttachInfo *ainfo;
-
/* NOTE: address_completion_end() does nothing with the window
* however this may change. */
address_completion_end(compose->window);
g_free(compose->exteditor_file);
- for (row = 0; (ainfo = gtk_clist_get_row_data(clist, row)) != NULL;
- row++)
- compose_attach_info_free(ainfo);
-
if (addressbook_get_target_compose() == compose)
addressbook_set_target_compose(NULL);
static void compose_attach_remove_selected(Compose *compose)
{
- GtkCList *clist = GTK_CLIST(compose->attach_clist);
+ GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
AttachInfo *ainfo;
- gint row;
+ GtkTreeSelection *selection;
+ GList *sel, *cur;
+ GtkTreeModel *model;
+
+ selection = gtk_tree_view_get_selection(tree_view);
+ sel = gtk_tree_selection_get_selected_rows(selection, &model);
- while (clist->selection != NULL) {
- row = GPOINTER_TO_INT(clist->selection->data);
- ainfo = gtk_clist_get_row_data(clist, row);
- compose_attach_info_free(ainfo);
- gtk_clist_remove(clist, row);
+ if (!sel)
+ return;
+
+ for (cur = sel; cur != NULL; cur = cur->next) {
+ GtkTreePath *path = cur->data;
+ GtkTreeRowReference *ref = gtk_tree_row_reference_new
+ (model, cur->data);
+ cur->data = ref;
+ gtk_tree_path_free(path);
+ }
+
+ for (cur = sel; cur != NULL; cur = cur->next) {
+ GtkTreeRowReference *ref = cur->data;
+ GtkTreePath *path = gtk_tree_row_reference_get_path(ref);
+ GtkTreeIter iter;
+
+ if (gtk_tree_model_get_iter(model, &iter, path))
+ gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
+
+ gtk_tree_path_free(path);
+ gtk_tree_row_reference_free(ref);
}
+
+ g_list_free(sel);
}
static struct _AttachProperty
GtkWidget *cancel_btn;
} attach_prop;
+static void gtk_tree_path_free_(gpointer ptr, gpointer data)
+{
+ gtk_tree_path_free((GtkTreePath *)ptr);
+}
+
static void compose_attach_property(Compose *compose)
{
- GtkCList *clist = GTK_CLIST(compose->attach_clist);
+ GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
AttachInfo *ainfo;
- gint row;
GtkOptionMenu *optmenu;
+ GtkTreeSelection *selection;
+ GList *sel;
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkTreePath *path;
static gboolean cancelled;
- if (!clist->selection) return;
- row = GPOINTER_TO_INT(clist->selection->data);
+ /* only if one selected */
+ selection = gtk_tree_view_get_selection(tree_view);
+ if (gtk_tree_selection_count_selected_rows(selection) != 1)
+ return;
- ainfo = gtk_clist_get_row_data(clist, row);
- if (!ainfo) return;
+ sel = gtk_tree_selection_get_selected_rows(selection, &model);
+ if (!sel)
+ return;
+
+ path = (GtkTreePath *) sel->data;
+ gtk_tree_model_get_iter(model, &iter, path);
+ gtk_tree_model_get(model, &iter, COL_DATA, &ainfo, -1);
+
+ if (!ainfo) {
+ g_list_foreach(sel, gtk_tree_path_free_, NULL);
+ g_list_free(sel);
+ return;
+ }
+ g_list_free(sel);
if (!attach_prop.window)
compose_attach_property_create(&cancelled);
cancelled = FALSE;
gtk_main();
- if (cancelled == TRUE) {
- gtk_widget_hide(attach_prop.window);
+ gtk_widget_hide(attach_prop.window);
+
+ if (cancelled)
break;
- }
entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.mimetype_entry));
if (*entry_text != '\0') {
if (size)
ainfo->size = size;
- gtk_clist_set_text(clist, row, COL_MIMETYPE,
- ainfo->content_type);
- gtk_clist_set_text(clist, row, COL_SIZE,
- to_human_readable(ainfo->size));
- gtk_clist_set_text(clist, row, COL_NAME, ainfo->name);
-
- gtk_widget_hide(attach_prop.window);
+ /* update tree store */
+ text = to_human_readable(ainfo->size);
+ gtk_tree_model_get_iter(model, &iter, path);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+ COL_MIMETYPE, ainfo->content_type,
+ COL_SIZE, text,
+ COL_NAME, ainfo->file,
+ -1);
+
break;
}
+
+ gtk_tree_path_free(path);
}
#define SET_LABEL_AND_ENTRY(str, entry, top) \
SET_LABEL_AND_ENTRY(_("Path"), path_entry, 2);
SET_LABEL_AND_ENTRY(_("File name"), filename_entry, 3);
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
- gtk_text_buffer_set_text(buffer, "\0", 1);
+ gtk_text_buffer_set_text(buffer, "", -1);
compose_insert_file(compose, compose->exteditor_file);
compose_changed_cb(NULL, compose);
}
}
-static gint calc_cursor_xpos(GtkTextView *text, gint extra, gint char_width)
-{
-#warning FIXME_GTK2
- return 0;
-}
-
/* callback functions */
/* compose_edit_size_alloc() - called when resized. don't know whether Gtk
/* got the maximum */
gtk_ruler_set_range(GTK_RULER(shruler),
- 0.0, line_width_in_chars,
- calc_cursor_xpos(GTK_TEXT_VIEW(widget),
- allocation->x,
- char_width),
+ 0.0, line_width_in_chars, 0,
/*line_width_in_chars*/ char_width);
}
}
}
-static void attach_selected(GtkCList *clist, gint row, gint column,
- GdkEvent *event, gpointer data)
+static void attach_selected(GtkTreeView *tree_view, GtkTreePath *tree_path,
+ GtkTreeViewColumn *column, Compose *compose)
{
- Compose *compose = (Compose *)data;
-
- if (event && event->type == GDK_2BUTTON_PRESS)
- compose_attach_property(compose);
+ compose_attach_property(compose);
}
static gboolean attach_button_pressed(GtkWidget *widget, GdkEventButton *event,
gpointer data)
{
Compose *compose = (Compose *)data;
- GtkCList *clist = GTK_CLIST(compose->attach_clist);
- gint row, column;
+ GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
+ GtkTreeIter iter;
if (!event) return FALSE;
if (event->button == 3) {
- if ((clist->selection && !clist->selection->next) ||
- !clist->selection) {
- gtk_clist_unselect_all(clist);
- if (gtk_clist_get_selection_info(clist,
- event->x, event->y,
- &row, &column)) {
- gtk_clist_select_row(clist, row, column);
- gtkut_clist_set_focus_row(clist, row);
- }
- }
gtk_menu_popup(GTK_MENU(compose->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
+ return TRUE;
}
return FALSE;
gint val;
val = compose_queue_sub(compose, NULL, NULL, TRUE);
- if (!val) gtk_widget_destroy(compose->window);
+ if (!val)
+ compose_close(compose);
}
void compose_draft (gpointer data)
}
fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
- fprintf(fp, "X-Sylpheed-Gnupg-Mode:%s\n", compose->privacy_system);
+ fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
fprintf(fp, "\n");
if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE) < 0) {
lock = FALSE;
if (action == COMPOSE_QUIT_EDITING)
- gtk_widget_destroy(compose->window);
+ compose_close(compose);
else {
struct stat s;
gchar *path;
for ( tmp = file_list; tmp; tmp = tmp->next) {
gchar *file = (gchar *) tmp->data;
- compose_attach_append(compose, file, file, NULL);
+ gchar *utf8_filename = conv_filename_to_utf8(file);
+ compose_attach_append(compose, file, utf8_filename, NULL);
compose_changed_cb(NULL, compose);
g_free(file);
+ g_free(utf8_filename);
}
g_list_free(file_list);
}
if (compose->modified) {
val = alertpanel(_("Discard message"),
_("This message has been modified. discard it?"),
- _("Discard"), _("to Draft"), _("Cancel"));
+ _("Discard"), _("to Draft"), GTK_STOCK_CANCEL);
switch (val) {
case G_ALERTDEFAULT:
}
}
- gtk_widget_destroy(compose->window);
+ compose_close(compose);
}
static void compose_address_cb(gpointer data, guint action, GtkWidget *widget)
msg = g_strdup_printf(_("Do you want to apply the template `%s' ?"),
tmpl->name);
val = alertpanel(_("Apply template"), msg,
- _("Replace"), _("Insert"), _("Cancel"));
+ _("Replace"), _("Insert"), GTK_STOCK_CANCEL);
g_free(msg);
if (val == G_ALERTDEFAULT)
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
-#warning FIXME_GTK2 /* should regist current line offset */
offset = gtk_text_iter_get_line_offset(&ins);
if (gtk_text_iter_forward_line(&ins)) {
gtk_text_iter_set_line_offset(&ins, offset);
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
-#warning FIXME_GTK2 /* should regist current line offset */
offset = gtk_text_iter_get_line_offset(&ins);
if (gtk_text_iter_backward_line(&ins)) {
gtk_text_iter_set_line_offset(&ins, offset);
static gchar *cliptext = NULL;
-static gboolean compose_grab_focus_before_cb(GtkWidget *widget, Compose *compose)
+static void compose_grab_focus_before_cb(GtkWidget *widget, Compose *compose)
{
gchar *str = NULL;
GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
- if (cliptext)
+ if (cliptext) {
g_free(cliptext);
+ cliptext = NULL;
+ }
+
if (gtk_clipboard_wait_is_text_available(clip))
cliptext = gtk_clipboard_wait_for_text(clip);
-
- return FALSE;
}
-static gboolean compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
+static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
{
gchar *str = NULL;
GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
compose->focused_editable = widget;
-
- return TRUE;
}
static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
{
Compose *compose = (Compose *)user_data;
GList *list, *tmp;
+
+ if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+ list = uri_list_extract_filenames((const gchar *)data->data);
+ for (tmp = list; tmp != NULL; tmp = tmp->next)
+ compose_attach_append
+ (compose, (const gchar *)tmp->data,
+ (const gchar *)tmp->data, NULL);
+ if (list) compose_changed_cb(NULL, compose);
+ list_free_strings(list);
+ g_list_free(list);
+ }
+}
- list = uri_list_extract_filenames((const gchar *)data->data);
- for (tmp = list; tmp != NULL; tmp = tmp->next)
- compose_attach_append
- (compose, (const gchar *)tmp->data,
- (const gchar *)tmp->data, NULL);
- if (list) compose_changed_cb(NULL, compose);
- list_free_strings(list);
- g_list_free(list);
+static gboolean compose_drag_drop(GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x, gint y,
+ guint time, gpointer user_data)
+{
+ /* not handling this signal makes compose_insert_drag_received_cb
+ * called twice */
+ return TRUE;
}
static void compose_insert_drag_received_cb (GtkWidget *widget,
Compose *compose = (Compose *)user_data;
GList *list, *tmp;
- list = uri_list_extract_filenames((const gchar *)data->data);
- for (tmp = list; tmp != NULL; tmp = tmp->next)
- compose_insert_file(compose, (const gchar *)tmp->data);
- list_free_strings(list);
- g_list_free(list);
+ /* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
+ * does not work */
+ if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+ list = uri_list_extract_filenames((const gchar *)data->data);
+ for (tmp = list; tmp != NULL; tmp = tmp->next) {
+ compose_insert_file(compose, (const gchar *)tmp->data);
+ }
+ list_free_strings(list);
+ g_list_free(list);
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
+ return;
+ } else {
+ gchar *tmpfile = get_tmp_file();
+ str_write_to_file((const gchar *)data->data, tmpfile);
+ compose_insert_file(compose, tmpfile);
+ unlink(tmpfile);
+ g_free(tmpfile);
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
+ return;
+ }
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
+}
+
+static void compose_header_drag_received_cb (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
+ gpointer user_data)
+{
+ GtkEditable *entry = (GtkEditable *)user_data;
+ gchar *email = (gchar *)data->data;
+
+ /* strangely, testing data->type == gdk_atom_intern("text/plain", TRUE)
+ * does not work */
+
+ if (!strncmp(email, "mailto:", strlen("mailto:"))) {
+ gchar decoded[strlen(email)];
+ int start = 0;
+
+ email += strlen("mailto:");
+ decode_uri(decoded, email); /* will fit */
+ gtk_editable_delete_text(entry, 0, -1);
+ gtk_editable_insert_text(entry, decoded, strlen(decoded), &start);
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
+ return;
+ }
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
}
#if 0 /* NEW COMPOSE GUI */
gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : vadj->upper));
}
-static void text_activated(GtkWidget *widget, Compose *compose)
-{
- compose_send_control_enter(compose);
-}
-
static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
const gchar *text, gint len, Compose *compose)
{
gint paste_as_quotation = GPOINTER_TO_INT(g_object_get_data
(G_OBJECT(compose->text), "paste_as_quotation"));
+ GtkTextMark *mark;
+
+ /* CLAWS: pass to default handler only if not pasting as quotation, and
+ * no autowrap */
+ if (!paste_as_quotation && !compose->autowrap)
+ return;
- g_return_if_fail(text);
+ g_return_if_fail(text != NULL);
g_signal_handlers_block_by_func(G_OBJECT(buffer),
G_CALLBACK(text_inserted),
} else
gtk_text_buffer_insert(buffer, iter, text, len);
- if (compose->autowrap)
- compose_wrap_line_all_full(compose, TRUE);
+ mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
+ compose_wrap_line_all_full(compose, TRUE);
+ gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
+ gtk_text_buffer_delete_mark(buffer, mark);
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
G_CALLBACK(text_inserted),
compose->draft_timeout_tag = gtk_timeout_add
(500, (GtkFunction) compose_defer_auto_save_draft, compose);
}
-
static gint compose_defer_auto_save_draft(Compose *compose)
{
compose->draft_timeout_tag = -1;
return FALSE;
}
-static gboolean compose_send_control_enter(Compose *compose)
-{
- GdkEvent *ev;
- GdkEventKey *kev;
- GtkItemFactory *ifactory;
- GtkAccelKey *accel;
- GtkWidget *send_menu;
- GSList *list;
- GdkModifierType ignored_mods =
- (GDK_LOCK_MASK | GDK_MOD2_MASK | GDK_MOD3_MASK |
- GDK_MOD4_MASK | GDK_MOD5_MASK);
-
- ev = gtk_get_current_event();
- if (ev->type != GDK_KEY_PRESS) return FALSE;
-
- kev = (GdkEventKey *)ev;
- if (!(kev->keyval == GDK_Return && (kev->state & GDK_CONTROL_MASK)))
- return FALSE;
-
- if (compose->exteditor_tag != -1)
- return FALSE;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- send_menu = gtk_item_factory_get_widget(ifactory, "/Message/Send");
- list = gtk_accel_groups_from_object(G_OBJECT(send_menu));
- if (!list)
- return FALSE;
-
- accel = (GtkAccelKey *)list->data;
- if (accel && accel->accel_key == kev->keyval &&
- (accel->accel_mods & ~ignored_mods) ==
- (kev->state & ~ignored_mods)) {
- compose_send_cb(compose, 0, NULL);
- return TRUE;
- }
-
- return FALSE;
-}
-
#if USE_ASPELL
static void compose_check_all(Compose *compose)
{
return account;
}
+static void compose_close(Compose *compose)
+{
+ gint x, y;
+
+ g_return_if_fail(compose);
+ gtkut_widget_get_uposition(compose->window, &x, &y);
+ prefs_common.compose_x = x;
+ prefs_common.compose_y = y;
+ gtk_widget_destroy(compose->window);
+}
+
/**
* Add entry field for each address in list.
* \param compose E-Mail composition object.
}
}
+void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,
+ guint action)
+{
+ gchar *body;
+ GSList *new_msglist = NULL;
+ MsgInfo *tmp_msginfo = NULL;
+
+ g_return_if_fail(msgview != NULL);
+
+ g_return_if_fail(msginfo_list != NULL);
+
+ if (g_slist_length(msginfo_list) == 1) {
+ MimeInfo *mimeinfo = messageview_get_selected_mime_part(msgview);
+ MsgInfo *orig_msginfo = (MsgInfo *)msginfo_list->data;
+
+ if (mimeinfo != NULL && mimeinfo->type == MIMETYPE_MESSAGE &&
+ !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
+
+ tmp_msginfo = procmsg_msginfo_new_from_mimeinfo(
+ orig_msginfo, mimeinfo);
+ if (tmp_msginfo != NULL) {
+ new_msglist = g_slist_append(NULL, tmp_msginfo);
+ }
+ }
+ }
+
+ body = messageview_get_selection(msgview);
+
+ if (new_msglist) {
+ compose_reply_mode((ComposeMode)action, new_msglist, body);
+ procmsg_msginfo_free(tmp_msginfo);
+ g_slist_free(new_msglist);
+ } else
+ compose_reply_mode((ComposeMode)action, msginfo_list, body);
+
+ g_free(body);
+}
+
/*
* End of Source.
*/
-
projects / claws.git / blobdiff