/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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 <gtk/gtkhbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkthemes.h>
+#include <gtk/gtktreeview.h>
+
#include <gtk/gtkdnd.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/wait.h>
#include <signal.h>
#include <errno.h>
+#include <libgen.h>
#if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
# include <wchar.h>
#include "main.h"
#include "mainwindow.h"
#include "compose.h"
-#include "gtkstext.h"
#include "addressbook.h"
#include "folderview.h"
#include "procmsg.h"
#include "foldersel.h"
#include "toolbar.h"
-#if USE_GPGME
-# include "rfc2015.h"
-#endif
-
typedef enum
{
COL_MIMETYPE = 0,
typedef enum
{
- COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE,
- COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER,
- COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER,
- COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD,
- COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD,
- COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE,
- COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE,
- COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE,
- COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER,
- COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER,
- COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD,
- COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD,
- COMPOSE_CALL_GTK_STEXT_DELETE_LINE,
- COMPOSE_CALL_GTK_STEXT_DELETE_LINE_N,
- COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END
-} ComposeCallGtkSTextAction;
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_WORD,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_WORD,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_END_OF_LINE,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_NEXT_LINE,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_PREVIOUS_LINE,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_CHARACTER,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_CHARACTER,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE_N,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END
+} ComposeCallAdvancedAction;
typedef enum
{
PRIORITY_LOWEST
} PriorityLevel;
+typedef enum
+{
+ COMPOSE_INSERT_SUCCESS,
+ COMPOSE_INSERT_READ_ERROR,
+ COMPOSE_INSERT_INVALID_CHARACTER,
+ COMPOSE_INSERT_NO_FILE
+} ComposeInsertResult;
+
+typedef enum
+{
+ COMPOSE_QUIT_EDITING,
+ COMPOSE_KEEP_EDITING,
+ COMPOSE_AUTO_SAVE
+} ComposeDraftAction;
+
+typedef enum
+{
+ COMPOSE_WRITE_FOR_SEND,
+ COMPOSE_WRITE_FOR_STORE
+} ComposeWriteType;
+
#define B64_LINE_SIZE 57
#define B64_BUFFSIZE 77
Compose *compose_generic_new (PrefsAccount *account,
const gchar *to,
FolderItem *item,
- GPtrArray *attach_files);
+ GPtrArray *attach_files,
+ GList *listAddress );
static Compose *compose_create (PrefsAccount *account,
ComposeMode mode);
static void compose_insert_sig (Compose *compose,
gboolean replace);
static gchar *compose_get_signature_str (Compose *compose);
-static void compose_insert_file (Compose *compose,
+static ComposeInsertResult compose_insert_file (Compose *compose,
const gchar *file);
static void compose_attach_append (Compose *compose,
const gchar *file,
static gboolean compose_check_entries (Compose *compose,
gboolean check_subject);
static gint compose_write_to_file (Compose *compose,
- const gchar *file,
- gboolean is_draft);
+ FILE *fp,
+ gint action);
static gint compose_write_body_to_file (Compose *compose,
const gchar *file);
static gint compose_remove_reedit_target (Compose *compose);
gint *msgnum,
FolderItem **item,
gboolean check_subject);
-static void compose_write_attach (Compose *compose,
- FILE *fp);
-static gint compose_write_headers (Compose *compose,
- FILE *fp,
- const gchar *charset,
- EncodingType encoding,
- gboolean is_draft);
+static void compose_add_attachments (Compose *compose,
+ MimeInfo *parent);
+static gchar *compose_get_header (Compose *compose);
static void compose_convert_header (gchar *dest,
gint len,
gchar *src,
gint header_len,
gboolean addr_field);
-static void compose_generate_msgid (Compose *compose,
- gchar *buf,
- gint len);
static void compose_attach_info_free (AttachInfo *ainfo);
static void compose_attach_remove_selected (Compose *compose);
static gint attach_property_delete_event (GtkWidget *widget,
GdkEventAny *event,
gboolean *cancelled);
-static void attach_property_key_pressed (GtkWidget *widget,
+static gboolean attach_property_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gboolean *cancelled);
gint redo_state,
gpointer data);
-static gint calc_cursor_xpos (GtkSText *text,
+static gint calc_cursor_xpos (GtkTextView *text,
gint extra,
gint char_width);
static void compose_add_header_entry (Compose *compose, gchar *header, gchar *text);
static void compose_update_priority_menu_item(Compose * compose);
+static void compose_add_field_list ( Compose *compose,
+ GList *listAddress );
+
/* callback functions */
static gboolean compose_edit_size_alloc (GtkEditable *widget,
gint column,
GdkEvent *event,
gpointer data);
-static void attach_button_pressed (GtkWidget *widget,
+static gboolean attach_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
-static void attach_key_pressed (GtkWidget *widget,
+static gboolean attach_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void compose_paste_as_quote_cb (Compose *compose);
static void compose_allsel_cb (Compose *compose);
-static void compose_gtk_stext_action_cb (Compose *compose,
- ComposeCallGtkSTextAction action);
+static void compose_advanced_action_cb (Compose *compose,
+ ComposeCallAdvancedAction action);
-static void compose_grab_focus_cb (GtkWidget *widget,
+static gboolean compose_grab_focus_cb (GtkWidget *widget,
Compose *compose);
-
-static void compose_changed_cb (GtkEditable *editable,
- Compose *compose);
-static void compose_button_press_cb (GtkWidget *widget,
- GdkEventButton *event,
+static gboolean compose_grab_focus_before_cb (GtkWidget *widget,
Compose *compose);
-#if 0
-static void compose_key_press_cb (GtkWidget *widget,
- GdkEventKey *event,
+
+static void compose_changed_cb (GtkTextBuffer *textbuf,
Compose *compose);
-#endif
+
+static void compose_toggle_autowrap_cb (gpointer data,
+ guint action,
+ GtkWidget *widget);
#if 0
static void compose_toggle_to_cb (gpointer data,
static void compose_toggle_ruler_cb (gpointer data,
guint action,
GtkWidget *widget);
-#if USE_GPGME
static void compose_toggle_sign_cb (gpointer data,
guint action,
GtkWidget *widget);
static void compose_toggle_encrypt_cb (gpointer data,
guint action,
GtkWidget *widget);
-static void compose_set_gnupg_mode_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_update_gnupg_mode_menu_item(Compose * compose);
-static void activate_gnupg_mode (Compose *compose,
- PrefsAccount *account);
-#endif
+static void compose_set_privacy_system_cb(gpointer data,
+ guint action,
+ GtkWidget *widget);
+static void compose_update_privacy_system_menu_item(Compose * compose);
+static void activate_privacy_system (Compose *compose,
+ PrefsAccount *account);
+static void compose_use_signing(Compose *compose, gboolean use_signing);
+static void compose_use_encryption(Compose *compose, gboolean use_encryption);
static void compose_toggle_return_receipt_cb(gpointer data, guint action,
GtkWidget *widget);
static void compose_toggle_remove_refs_cb(gpointer data, guint action,
static void text_activated (GtkWidget *widget,
Compose *compose);
-static void text_inserted (GtkWidget *widget,
+static void text_inserted (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
const gchar *text,
- gint length,
- gint *position,
+ gint len,
Compose *compose);
static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
gboolean to_all, gboolean to_ml,
gboolean followup_and_reply_to,
const gchar *body);
-void compose_headerentry_changed_cb (GtkWidget *entry,
+gboolean compose_headerentry_changed_cb (GtkWidget *entry,
ComposeHeaderEntry *headerentry);
-void compose_headerentry_key_press_event_cb(GtkWidget *entry,
+gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
GdkEventKey *event,
ComposeHeaderEntry *headerentry);
static void compose_show_first_last_header (Compose *compose, gboolean show_first);
+static void compose_allow_user_actions (Compose *compose, gboolean allow);
+
#if USE_ASPELL
static void compose_check_all (Compose *compose);
static void compose_highlight_all (Compose *compose);
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 GtkItemFactoryEntry compose_popup_entries[] =
{
static GtkItemFactoryEntry compose_entries[] =
{
- {N_("/_File"), NULL, NULL, 0, "<Branch>"},
- {N_("/_File/_Attach file"), "<control>M", compose_attach_cb, 0, NULL},
- {N_("/_File/_Insert file"), "<control>I", compose_insert_file_cb, 0, NULL},
- {N_("/_File/Insert si_gnature"), "<control>G", compose_insert_sig_cb, 0, NULL},
- {N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_File/_Close"), "<control>W", compose_close_cb, 0, NULL},
+ {N_("/_Message"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Message/_Send"), "<control>Return",
+ compose_send_cb, 0, NULL},
+ {N_("/_Message/Send _later"), "<shift><control>S",
+ compose_send_later_cb, 0, NULL},
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Message/_Attach file"), "<control>M", compose_attach_cb, 0, NULL},
+ {N_("/_Message/_Insert file"), "<control>I", compose_insert_file_cb, 0, NULL},
+ {N_("/_Message/Insert si_gnature"), "<control>G", compose_insert_sig_cb, 0, NULL},
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Message/_Save"),
+ "<control>S", compose_draft_cb, COMPOSE_KEEP_EDITING, NULL},
+ {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Message/_Close"), "<control>W", compose_close_cb, 0, NULL},
{N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
{N_("/_Edit/_Undo"), "<control>Z", compose_undo_cb, 0, NULL},
{N_("/_Edit/A_dvanced"), NULL, NULL, 0, "<Branch>"},
{N_("/_Edit/A_dvanced/Move a character backward"),
"<control>B",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER,
NULL},
{N_("/_Edit/A_dvanced/Move a character forward"),
"<control>F",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER,
NULL},
{N_("/_Edit/A_dvanced/Move a word backward"),
NULL, /* "<alt>B" */
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_WORD,
NULL},
{N_("/_Edit/A_dvanced/Move a word forward"),
NULL, /* "<alt>F" */
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_WORD,
NULL},
{N_("/_Edit/A_dvanced/Move to beginning of line"),
NULL, /* "<control>A" */
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE,
NULL},
{N_("/_Edit/A_dvanced/Move to end of line"),
"<control>E",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_END_OF_LINE,
NULL},
{N_("/_Edit/A_dvanced/Move to previous line"),
"<control>P",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_PREVIOUS_LINE,
NULL},
{N_("/_Edit/A_dvanced/Move to next line"),
"<control>N",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_NEXT_LINE,
NULL},
{N_("/_Edit/A_dvanced/Delete a character backward"),
"<control>H",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_CHARACTER,
NULL},
{N_("/_Edit/A_dvanced/Delete a character forward"),
"<control>D",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_CHARACTER,
NULL},
{N_("/_Edit/A_dvanced/Delete a word backward"),
NULL, /* "<control>W" */
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD,
NULL},
{N_("/_Edit/A_dvanced/Delete a word forward"),
NULL, /* "<alt>D", */
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD,
NULL},
{N_("/_Edit/A_dvanced/Delete line"),
"<control>U",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_LINE,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE,
NULL},
{N_("/_Edit/A_dvanced/Delete entire line"),
NULL,
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_LINE_N,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE_N,
NULL},
{N_("/_Edit/A_dvanced/Delete to end of line"),
"<control>K",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END,
NULL},
{N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Edit/_Wrap current paragraph"),
"<control>L", compose_wrap_line, 0, NULL},
{N_("/_Edit/Wrap all long _lines"),
"<control><alt>L", compose_wrap_line_all, 0, NULL},
+ {N_("/_Edit/Aut_o wrapping"), "<shift><control>L", compose_toggle_autowrap_cb, 0, "<ToggleItem>"},
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Edit/Edit with e_xternal editor"),
"<shift><control>X", compose_ext_editor_cb, 0, NULL},
#if USE_ASPELL
{N_("/_Spelling/_Spelling Configuration"),
NULL, NULL, 0, "<Branch>"},
#endif
-#if 0 /* NEW COMPOSE GUI */
- {N_("/_View"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/_To"), NULL, compose_toggle_to_cb , 0, "<ToggleItem>"},
- {N_("/_View/_Cc"), NULL, compose_toggle_cc_cb , 0, "<ToggleItem>"},
- {N_("/_View/_Bcc"), NULL, compose_toggle_bcc_cb , 0, "<ToggleItem>"},
- {N_("/_View/_Reply to"), NULL, compose_toggle_replyto_cb, 0, "<ToggleItem>"},
- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Followup to"), NULL, compose_toggle_followupto_cb, 0, "<ToggleItem>"},
- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/R_uler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Attachment"), NULL, compose_toggle_attach_cb, 0, "<ToggleItem>"},
-#endif
- {N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/_Send"), "<control>Return",
- compose_send_cb, 0, NULL},
- {N_("/_Message/Send _later"), "<shift><control>S",
- compose_send_later_cb, 0, NULL},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Save to _draft folder"),
- "<shift><control>D", compose_draft_cb, 0, NULL},
- {N_("/_Message/Save and _keep editing"),
- "<control>S", compose_draft_cb, 1, NULL},
-#if 0 /* NEW COMPOSE GUI */
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_To"), NULL, compose_toggle_to_cb , 0, "<ToggleItem>"},
- {N_("/_Message/_Cc"), NULL, compose_toggle_cc_cb , 0, "<ToggleItem>"},
- {N_("/_Message/_Bcc"), NULL, compose_toggle_bcc_cb , 0, "<ToggleItem>"},
- {N_("/_Message/_Reply to"), NULL, compose_toggle_replyto_cb, 0, "<ToggleItem>"},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Followup to"), NULL, compose_toggle_followupto_cb, 0, "<ToggleItem>"},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Attach"), NULL, compose_toggle_attach_cb, 0, "<ToggleItem>"},
-#endif
-#if USE_GPGME
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
- {N_("/_Message/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
- {N_("/_Message/Mode/MIME"), NULL, compose_set_gnupg_mode_cb, GNUPG_MODE_DETACH, "<RadioItem>"},
- {N_("/_Message/Mode/Inline"), NULL, compose_set_gnupg_mode_cb, GNUPG_MODE_INLINE, "/Message/Mode/MIME"},
-#endif /* USE_GPGME */
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Priority"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/Priority/_Highest"), NULL, compose_set_priority_cb, PRIORITY_HIGHEST, "<RadioItem>"},
- {N_("/_Message/Priority/Hi_gh"), NULL, compose_set_priority_cb, PRIORITY_HIGH, "/Message/Priority/Highest"},
- {N_("/_Message/Priority/_Normal"), NULL, compose_set_priority_cb, PRIORITY_NORMAL, "/Message/Priority/Highest"},
- {N_("/_Message/Priority/Lo_w"), NULL, compose_set_priority_cb, PRIORITY_LOW, "/Message/Priority/Highest"},
- {N_("/_Message/Priority/_Lowest"), NULL, compose_set_priority_cb, PRIORITY_LOWEST, "/Message/Priority/Highest"},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
- {N_("/_Message/Remo_ve references"), NULL, compose_toggle_remove_refs_cb, 0, "<ToggleItem>"},
+ {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/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>"},
+ {N_("/_Options/_Priority"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Options/Priority/_Highest"), NULL, compose_set_priority_cb, PRIORITY_HIGHEST, "<RadioItem>"},
+ {N_("/_Options/Priority/Hi_gh"), NULL, compose_set_priority_cb, PRIORITY_HIGH, "/Options/Priority/Highest"},
+ {N_("/_Options/Priority/_Normal"), NULL, compose_set_priority_cb, PRIORITY_NORMAL, "/Options/Priority/Highest"},
+ {N_("/_Options/Priority/Lo_w"), NULL, compose_set_priority_cb, PRIORITY_LOW, "/Options/Priority/Highest"},
+ {N_("/_Options/Priority/_Lowest"), NULL, compose_set_priority_cb, PRIORITY_LOWEST, "/Options/Priority/Highest"},
+ {N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Options/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
+ {N_("/_Options/Remo_ve references"), NULL, compose_toggle_remove_refs_cb, 0, "<ToggleItem>"},
{N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tools/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
{N_("/_Tools/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL},
Compose *compose_new(PrefsAccount *account, const gchar *mailto,
GPtrArray *attach_files)
{
- return compose_generic_new(account, mailto, NULL, attach_files);
+ return compose_generic_new(account, mailto, NULL, attach_files, NULL);
}
Compose *compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
{
- return compose_generic_new(account, NULL, item, NULL);
+ return compose_generic_new(account, NULL, item, NULL, NULL);
+}
+
+Compose *compose_new_with_list( PrefsAccount *account, GList *listAddress )
+{
+ return compose_generic_new( account, NULL, NULL, NULL, listAddress );
}
Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderItem *item,
- GPtrArray *attach_files)
+ GPtrArray *attach_files, GList *listAddress )
{
Compose *compose;
- GtkSText *text;
+ GtkTextView *textview;
+ GtkTextBuffer *textbuf;
+ GtkTextIter iter;
GtkItemFactory *ifactory;
- gboolean grab_focus_on_last = TRUE;
if (item && item->prefs && item->prefs->enable_default_account)
account = account_find_from_id(item->prefs->default_account);
compose->replyinfo = NULL;
compose->fwdinfo = NULL;
- text = GTK_STEXT(compose->text);
- gtk_stext_freeze(text);
+ textview = GTK_TEXT_VIEW(compose->text);
+ textbuf = gtk_text_view_get_buffer(textview);
+
+ undo_block(compose->undostruct);
+#ifdef USE_ASPELL
+ if (item && item->prefs && item->prefs->enable_default_dictionary &&
+ compose->gtkaspell)
+ gtkaspell_change_dict(compose->gtkaspell,
+ item->prefs->default_dictionary);
+#endif
if (account->auto_sig)
compose_insert_sig(compose, FALSE);
- gtk_editable_set_position(GTK_EDITABLE(text), 0);
- gtk_stext_set_point(text, 0);
-
- gtk_stext_thaw(text);
+ gtk_text_buffer_get_start_iter(textbuf, &iter);
+ gtk_text_buffer_place_cursor(textbuf, &iter);
if (account->protocol != A_NNTP) {
if (mailto && *mailto != '\0') {
} else if (item && item->prefs->enable_default_to) {
compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
- compose_entry_select(compose, item->prefs->default_to);
- grab_focus_on_last = FALSE;
+ compose_entry_mark_default_to(compose, item->prefs->default_to);
}
if (item && item->ret_rcpt) {
- menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
+ menu_set_active(ifactory, "/Message/Request Return Receipt", TRUE);
}
} else {
if (mailto) {
*/
menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
}
+ compose_add_field_list( compose, listAddress );
if (attach_files) {
gint i;
g_free(folderidentifier);
}
- /* Grab focus on last header only if no default_to was set */
- if (grab_focus_on_last)
- gtk_widget_grab_focus(compose->header_last->entry);
+ gtk_widget_grab_focus(compose->header_last->entry);
+
+ undo_unblock(compose->undostruct);
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
case COMPOSE_FORWARD_INLINE:
/* check if we reply to more than one Message */
if (list_len == 1) {
- compose_forward(NULL, msginfo, FALSE, body);
+ compose_forward(NULL, msginfo, FALSE, body, FALSE);
break;
}
/* more messages FALL THROUGH */
Compose *compose;
PrefsAccount *account = NULL;
PrefsAccount *reply_account;
- GtkSText *text;
+ GtkTextView *textview;
+ GtkTextBuffer *textbuf;
+ GtkTextIter iter;
+ int cursor_pos;
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
compose = compose_create(account, COMPOSE_REPLY);
ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_toggle(ifactory, "/Message/Remove references", FALSE);
- menu_set_sensitive(ifactory, "/Message/Remove references", TRUE);
+ menu_set_active(ifactory, "/Options/Remove references", FALSE);
+ menu_set_sensitive(ifactory, "/Options/Remove references", TRUE);
compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
if (!compose->replyinfo)
compose->replyinfo = procmsg_msginfo_copy(msginfo);
if (msginfo->folder && msginfo->folder->ret_rcpt)
- menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
+ menu_set_active(ifactory, "/Message/Request Return Receipt", TRUE);
/* Set save folder */
if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
to_sender, followup_and_reply_to);
compose_show_first_last_header(compose, TRUE);
- text = GTK_STEXT(compose->text);
- gtk_stext_freeze(text);
+ textview = (GTK_TEXT_VIEW(compose->text));
+ textbuf = gtk_text_view_get_buffer(textview);
+
+ undo_block(compose->undostruct);
+#ifdef USE_ASPELL
+ if (msginfo->folder && msginfo->folder->prefs &&
+ msginfo->folder->prefs &&
+ msginfo->folder->prefs->enable_default_dictionary &&
+ compose->gtkaspell)
+ gtkaspell_change_dict(compose->gtkaspell,
+ msginfo->folder->prefs->default_dictionary);
+#endif
if (quote) {
gchar *qmark;
if (quote && prefs_common.linewrap_quote)
compose_wrap_line_all(compose);
- gtk_editable_set_position(GTK_EDITABLE(text), 0);
- gtk_stext_set_point(text, 0);
+ 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) {
+ compose_wrap_line_all(compose);
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), TRUE);
+ }
- gtk_stext_thaw(text);
gtk_widget_grab_focus(compose->text);
+ undo_unblock(compose->undostruct);
+
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
}
}
Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
- gboolean as_attach, const gchar *body)
+ gboolean as_attach, const gchar *body,
+ gboolean no_extedit)
{
Compose *compose;
- GtkSText *text;
+ GtkTextView *textview;
+ GtkTextBuffer *textbuf;
+ GtkTextIter iter;
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
- if (msginfo->folder->prefs->enable_default_account)
- account = account_find_from_id(msginfo->folder->prefs->default_account);
- if (!account)
- account = msginfo->folder->folder->account;
- if (!account && msginfo->to && prefs_common.forward_account_autosel) {
- gchar *to;
- Xstrdup_a(to, msginfo->to, return NULL);
- extract_address(to);
- account = account_find_from_address(to);
- }
-
- if (!account && prefs_common.forward_account_autosel) {
- gchar cc[BUFFSIZE];
- if (!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
- extract_address(cc);
- account = account_find_from_address(cc);
- }
- }
-
- if (account == NULL) {
+ if (!account &&
+ !(account = compose_guess_forward_account_from_msginfo
+ (msginfo)))
account = cur_account;
- /*
- account = msginfo->folder->folder->account;
- if (!account) account = cur_account;
- */
- }
- g_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, COMPOSE_FORWARD);
g_free(buf2);
}
- text = GTK_STEXT(compose->text);
- gtk_stext_freeze(text);
+ textview = GTK_TEXT_VIEW(compose->text);
+ textbuf = gtk_text_view_get_buffer(textview);
if (as_attach) {
gchar *msgfile;
if (prefs_common.linewrap_quote)
compose_wrap_line_all(compose);
- gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
- gtk_stext_set_point(GTK_STEXT(compose->text), 0);
+ gtk_text_buffer_get_start_iter(textbuf, &iter);
+ gtk_text_buffer_place_cursor(textbuf, &iter);
- gtk_stext_thaw(text);
#if 0 /* NEW COMPOSE GUI */
if (account->protocol != A_NNTP)
gtk_widget_grab_focus(compose->to_entry);
#endif
gtk_widget_grab_focus(compose->header_last->entry);
- if (prefs_common.auto_exteditor)
+ if (!no_extedit && prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
/*save folder*/
Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_list)
{
Compose *compose;
- GtkSText *text;
+ GtkTextView *textview;
+ GtkTextBuffer *textbuf;
+ GtkTextIter iter;
GSList *msginfo;
gchar *msgfile;
g_return_val_if_fail(msginfo_list != NULL, NULL);
-
- for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
- if ( ((MsgInfo *)msginfo->data)->folder == NULL )
+
+ for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next)
+ if (((MsgInfo *)msginfo->data)->folder == NULL)
return NULL;
- }
- if (account == NULL) {
+ /* guess account from first selected message */
+ if (!account &&
+ !(account = compose_guess_forward_account_from_msginfo
+ (msginfo_list->data)))
account = cur_account;
- /*
- account = msginfo->folder->folder->account;
- if (!account) account = cur_account;
- */
- }
+
g_return_val_if_fail(account != NULL, NULL);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
compose = compose_create(account, COMPOSE_FORWARD);
- text = GTK_STEXT(compose->text);
- gtk_stext_freeze(text);
+ textview = GTK_TEXT_VIEW(compose->text);
+ textbuf = gtk_text_view_get_buffer(textview);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
if (prefs_common.linewrap_quote)
compose_wrap_line_all(compose);
- gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
- gtk_stext_set_point(GTK_STEXT(compose->text), 0);
+ gtk_text_buffer_get_start_iter(textbuf, &iter);
+ gtk_text_buffer_place_cursor(textbuf, &iter);
- gtk_stext_thaw(text);
gtk_widget_grab_focus(compose->header_last->entry);
#if 0 /* NEW COMPOSE GUI */
{
Compose *compose;
PrefsAccount *account = NULL;
- GtkSText *text;
+ GtkTextView *textview;
+ GtkTextBuffer *textbuf;
+ GtkTextMark *mark;
+ GtkTextIter iter;
FILE *fp;
gchar buf[BUFFSIZE];
+ gboolean use_signing = FALSE;
+ gboolean use_encryption = FALSE;
+ gchar *privacy_system = NULL;
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
if (msginfo->folder->stype == F_QUEUE || msginfo->folder->stype == F_DRAFT) {
gchar queueheader_buf[BUFFSIZE];
- gint id;
+ gint id, param;
/* Select Account from queue headers */
- if (!get_header_from_msginfo(msginfo, queueheader_buf,
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Account-Id:")) {
- id = atoi(&queueheader_buf[22]);
+ id = atoi(&queueheader_buf[strlen("X-Sylpheed-Account-Id:")]);
account = account_find_from_id(id);
}
- if (!account && !get_header_from_msginfo(msginfo, queueheader_buf,
+ if (!account && !procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "NAID:")) {
- id = atoi(&queueheader_buf[5]);
+ id = atoi(&queueheader_buf[strlen("NAID:")]);
account = account_find_from_id(id);
}
- if (!account && !get_header_from_msginfo(msginfo, queueheader_buf,
+ if (!account && !procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "MAID:")) {
- id = atoi(&queueheader_buf[5]);
+ id = atoi(&queueheader_buf[strlen("MAID:")]);
account = account_find_from_id(id);
}
- if (!account && !get_header_from_msginfo(msginfo, queueheader_buf,
+ if (!account && !procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "S:")) {
account = account_find_from_address(queueheader_buf);
}
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Sylpheed-Sign:")) {
+ param = atoi(&queueheader_buf[strlen("X-Sylpheed-Sign:")]);
+ use_signing = param;
+
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Sylpheed-Encrypt:")) {
+ param = atoi(&queueheader_buf[strlen("X-Sylpheed-Encrypt:")]);
+ use_encryption = param;
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Sylpheed-Privacy-System:")) {
+ privacy_system = g_strdup(&queueheader_buf[strlen("X-Sylpheed-Privacy-System:")]);
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Priority: ")) {
+ param = atoi(&queueheader_buf[strlen("X-Priority: ")]); /* mind the space */
+ compose->priority = param;
+ }
} else
account = msginfo->folder->folder->account;
if (!account && prefs_common.reedit_account_autosel) {
gchar from[BUFFSIZE];
- if (!get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")){
+ if (!procheader_get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")){
extract_address(from);
account = account_find_from_address(from);
}
g_return_if_fail(account != NULL);
compose = compose_create(account, COMPOSE_REEDIT);
+ compose->privacy_system = privacy_system;
+ compose_use_signing(compose, use_signing);
+ compose_use_encryption(compose, use_encryption);
compose->targetinfo = procmsg_msginfo_copy(msginfo);
if (msginfo->folder->stype == F_QUEUE
gchar queueheader_buf[BUFFSIZE];
/* Set message save folder */
- if (!get_header_from_msginfo(msginfo, queueheader_buf, sizeof(queueheader_buf), "SCF:")) {
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf, sizeof(queueheader_buf), "SCF:")) {
gint startpos = 0;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
if (compose_parse_header(compose, msginfo) < 0) return;
compose_reedit_set_entry(compose, msginfo);
- text = GTK_STEXT(compose->text);
- gtk_stext_freeze(text);
+ textview = GTK_TEXT_VIEW(compose->text);
+ textbuf = gtk_text_view_get_buffer(textview);
+ mark = gtk_text_buffer_get_insert(textbuf);
+ gtk_text_buffer_get_iter_at_mark(textbuf, &iter, mark);
+
+ g_signal_handlers_block_by_func(G_OBJECT(textbuf),
+ G_CALLBACK(compose_changed_cb),
+ 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_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ gtk_text_buffer_insert(textbuf, &iter, buf, -1);
}
fclose(fp);
}
+
compose_attach_parts(compose, msginfo);
- gtk_stext_thaw(text);
+ g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+
gtk_widget_grab_focus(compose->text);
if (prefs_common.auto_exteditor)
Compose *compose;
gchar *filename;
GtkItemFactory *ifactory;
+ FolderItem *item;
g_return_val_if_fail(msginfo != NULL, NULL);
compose->redirect_filename = filename;
+ /* Set save folder */
+ item = msginfo->folder;
+ if (item && item->prefs && item->prefs->save_copy_to_folder) {
+ gchar *folderidentifier;
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
+ folderidentifier = folder_item_get_identifier(item);
+ gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
+ g_free(folderidentifier);
+ }
+
compose_attach_parts(compose, msginfo);
if (msginfo->subject)
msginfo->subject);
gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
- gtk_stext_freeze(GTK_STEXT(compose->text));
compose_quote_fmt(compose, msginfo, "%M", NULL, NULL);
- gtk_editable_set_editable(GTK_EDITABLE(compose->text), FALSE);
- gtk_stext_thaw(GTK_STEXT(compose->text));
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), TRUE);
ifactory = gtk_item_factory_from_widget(compose->popupmenu);
menu_set_sensitive(ifactory, "/Add...", FALSE);
menu_set_sensitive(ifactory, "/Property...", FALSE);
ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_sensitive(ifactory, "/File/Insert file", FALSE);
- menu_set_sensitive(ifactory, "/File/Attach file", FALSE);
- menu_set_sensitive(ifactory, "/File/Insert signature", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Save", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Insert file", 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, "/Message/Save to draft folder", FALSE);
- menu_set_sensitive(ifactory, "/Message/Save and keep editing", FALSE);
-#if USE_GPGME
- menu_set_sensitive(ifactory, "/Message/Sign", FALSE);
- menu_set_sensitive(ifactory, "/Message/Encrypt", FALSE);
- menu_set_sensitive(ifactory, "/Message/Mode/MIME", FALSE);
- menu_set_sensitive(ifactory, "/Message/Mode/Inline", FALSE);
-#endif
- menu_set_sensitive(ifactory, "/Message/Priority", FALSE);
- menu_set_sensitive(ifactory, "/Message/Request Return Receipt", 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, "/Tools/Show ruler", FALSE);
menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
- gtk_widget_set_sensitive(compose->toolbar->linewrap_btn, FALSE);
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
return compose;
}
compose_add_header_entry(compose, header, (gchar *)address);
}
-void compose_entry_select (Compose *compose, const gchar *mailto)
+void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
{
- GSList *header_list;
+ static GtkStyle *bold_style = NULL;
+ static GdkColor bold_color;
+ GSList *h_list;
+ GtkEntry *entry;
- for (header_list = compose->header_list; header_list != NULL; header_list = header_list->next) {
- GtkEntry * entry = GTK_ENTRY(((ComposeHeaderEntry *)header_list->data)->entry);
-
- if (gtk_entry_get_text(entry) && !g_strcasecmp(gtk_entry_get_text(entry), mailto)) {
- gtk_entry_select_region(entry, 0, -1);
- gtk_widget_grab_focus(GTK_WIDGET(entry));
+ for (h_list = compose->header_list; h_list != NULL; h_list = h_list->next) {
+ entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
+ if (gtk_entry_get_text(entry) &&
+ !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
+ gtk_widget_ensure_style(GTK_WIDGET(entry));
+ if (!bold_style) {
+ PangoFontDescription *font_desc = NULL;
+ gtkut_convert_int_to_gdk_color
+ (prefs_common.color_new, &bold_color);
+ bold_style = gtk_style_copy(gtk_widget_get_style
+ (GTK_WIDGET(entry)));
+ if (BOLD_FONT)
+ font_desc = pango_font_description_from_string
+ (BOLD_FONT);
+ if (font_desc) {
+ if (bold_style->font_desc)
+ pango_font_description_free
+ (bold_style->font_desc);
+ bold_style->font_desc = font_desc;
+ }
+ bold_style->fg[GTK_STATE_NORMAL] = bold_color;
+ }
+ gtk_widget_set_style(GTK_WIDGET(entry), bold_style);
}
}
}
compose_send_later_cb(compose, 0, NULL);
break;
case A_DRAFT:
- compose_draft_cb(compose, 0, NULL);
+ compose_draft_cb(compose, COMPOSE_QUIT_EDITING, NULL);
break;
case A_INSERT:
compose_insert_file_cb(compose, 0, NULL);
case A_EXTEDITOR:
compose_ext_editor_cb(compose, 0, NULL);
break;
- case A_LINEWRAP:
+ case A_LINEWRAP_CURRENT:
compose_wrap_line(compose);
break;
+ case A_LINEWRAP_ALL:
+ compose_wrap_line_all(compose);
+ break;
case A_ADDRBOOK:
compose_address_cb(compose, 0, NULL);
break;
+#ifdef USE_ASPELL
+ case A_CHECK_SPELLING:
+ compose_check_all(compose);
+ break;
+#endif
default:
break;
}
if (subject)
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), subject);
if (body) {
- gtk_stext_insert(GTK_STEXT(compose->text),
- NULL, NULL, NULL, body, -1);
- gtk_stext_insert(GTK_STEXT(compose->text),
- NULL, NULL, NULL, "\n", 1);
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+ GtkTextMark *mark;
+ GtkTextIter iter;
+
+ 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);
+ gtk_text_buffer_insert(buffer, &iter, "\n", 1);
}
g_free(to);
for (cur = ref_id_list; cur != NULL; cur = cur->next) {
if (new_ref->len > 0)
g_string_append(new_ref, "\n\t");
- g_string_sprintfa(new_ref, "<%s>", (gchar *)cur->data);
+ g_string_append_printf(new_ref, "<%s>", (gchar *)cur->data);
}
slist_free_strings(ref_id_list);
const gchar *fmt, const gchar *qmark,
const gchar *body)
{
- GtkSText *text = GTK_STEXT(compose->text);
static MsgInfo dummyinfo;
gchar *quote_str = NULL;
gchar *buf;
} else
buf = "";
- gtk_stext_freeze(text);
-
for (p = buf; *p != '\0'; ) {
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+ GtkTextMark *mark;
+ GtkTextIter iter;
+
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+
lastp = strchr(p, '\n');
len = lastp ? lastp - p + 1 : -1;
- gtk_stext_insert(text, NULL, NULL, NULL, p, len);
+
+ gtk_text_buffer_insert(buffer, &iter, p, len);
+
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+
if (lastp)
p = lastp + 1;
else
break;
}
- gtk_stext_thaw(text);
-
return buf;
}
}
if (msginfo->subject && *msginfo->subject) {
- gchar *buf, *buf2, *p;
+ gchar *buf, *buf2;
+ guchar *p;
buf = p = g_strdup(msginfo->subject);
p += subject_get_prefix_length(p);
if (replyto && from)
cc_list = address_list_append_with_comments(cc_list, from);
+ if (to_all && msginfo->folder &&
+ msginfo->folder->prefs->enable_default_reply_to)
+ cc_list = address_list_append_with_comments(cc_list,
+ msginfo->folder->prefs->default_reply_to);
cc_list = address_list_append_with_comments(cc_list, msginfo->to);
cc_list = address_list_append_with_comments(cc_list, compose->cc);
SET_ADDRESS(COMPOSE_FOLLOWUPTO, compose->followup_to);
compose_update_priority_menu_item(compose);
-#if USE_GPGME
- compose_update_gnupg_mode_menu_item(compose);
-#endif
+ compose_update_privacy_system_menu_item(compose);
compose_show_first_last_header(compose, TRUE);
-
}
#undef SET_ENTRY
static void compose_insert_sig(Compose *compose, gboolean replace)
{
- GtkSText *text = GTK_STEXT(compose->text);
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+ GtkTextMark *mark;
+ GtkTextIter iter;
gint cur_pos;
- gint len;
+
g_return_if_fail(compose->account != NULL);
- cur_pos = gtk_editable_get_position(GTK_EDITABLE(text));
-
- gtk_stext_freeze(text);
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+ cur_pos = gtk_text_iter_get_offset (&iter);
- len = gtk_stext_get_length(text);
- gtk_stext_set_point(text, len);
+ gtk_text_buffer_get_end_iter(buffer, &iter);
if (replace && compose->sig_str) {
- gint pos;
+ gboolean found;
+ GtkTextIter first_iter, start_iter, end_iter;
+
+ gtk_text_buffer_get_start_iter(buffer, &first_iter);
if (compose->sig_str[0] == '\0')
- pos = -1;
+ found = FALSE;
else
- pos = gtkut_stext_find(text, 0, compose->sig_str, TRUE);
-
- if (pos != -1) {
- len = get_mbs_len(compose->sig_str);
- if (len >= 0) {
- gtk_stext_set_point(text, pos);
- gtk_stext_forward_delete(text, len);
- }
+ found = gtk_text_iter_forward_search(&first_iter,
+ compose->sig_str,
+ GTK_TEXT_SEARCH_TEXT_ONLY,
+ &start_iter, &end_iter,
+ NULL);
+
+ if (found) {
+ gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
+ iter = start_iter;
}
}
if (!compose->sig_str || (replace && !compose->account->auto_sig))
compose->sig_str = g_strdup("");
- gtk_stext_insert(text, NULL, NULL, NULL, compose->sig_str, -1);
+ gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
- gtk_stext_thaw(text);
+ if (cur_pos > gtk_text_buffer_get_char_count (buffer))
+ cur_pos = gtk_text_buffer_get_char_count (buffer);
- if (cur_pos > gtk_stext_get_length(text))
- cur_pos = gtk_stext_get_length(text);
+ gtk_text_buffer_get_iter_at_offset (buffer, &iter, cur_pos);
+ gtk_text_buffer_place_cursor (buffer, &iter);
- gtk_editable_set_position(GTK_EDITABLE(text), cur_pos);
- gtk_stext_set_point(text, cur_pos);
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+
}
static gchar *compose_get_signature_str(Compose *compose)
return sig_str;
}
-static void compose_insert_file(Compose *compose, const gchar *file)
+static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *file)
{
- GtkSText *text = GTK_STEXT(compose->text);
+ GtkTextView *text;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter iter;
gchar buf[BUFFSIZE];
gint len;
FILE *fp;
+ gboolean badtxt = FALSE;
- g_return_if_fail(file != NULL);
+ g_return_val_if_fail(file != NULL, COMPOSE_INSERT_NO_FILE);
if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
- return;
+ return COMPOSE_INSERT_READ_ERROR;
}
- gtk_stext_freeze(text);
+ text = GTK_TEXT_VIEW(compose->text);
+ buffer = gtk_text_view_get_buffer(text);
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
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);
+
+ if (!str) continue;
+
/* strip <CR> if DOS/Windows file,
replace <CR> with <LF> if Macintosh file. */
- strcrchomp(buf);
- len = strlen(buf);
- if (len > 0 && buf[len - 1] != '\n') {
+ strcrchomp(str);
+ len = strlen(str);
+ if (len > 0 && str[len - 1] != '\n') {
while (--len >= 0)
- if (buf[len] == '\r') buf[len] = '\n';
+ if (str[len] == '\r') str[len] = '\n';
}
- gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ gtk_text_buffer_insert(buffer, &iter, str, -1);
+
+ g_free (str);
}
- gtk_stext_thaw(text);
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
fclose(fp);
+
+ if (badtxt)
+ return COMPOSE_INSERT_INVALID_CHARACTER;
+ else
+ return COMPOSE_INSERT_SUCCESS;
}
static void compose_attach_append(Compose *compose, const gchar *file,
#if 0 /* NEW COMPOSE GUI */
if (!compose->use_attach) {
GtkItemFactory *ifactory;
- GtkWidget *menuitem;
ifactory = gtk_item_factory_from_widget(compose->menubar);
- menuitem = gtk_item_factory_get_item(ifactory,
- "/View/Attachment");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- TRUE);
+ menu_set_active(ifactory, "/View/Attachment", TRUE);
}
#endif
ainfo = g_new0(AttachInfo, 1);
if (content_type) {
ainfo->content_type = g_strdup(content_type);
- if (!strcasecmp(content_type, "message/rfc822")) {
+ if (!g_ascii_strcasecmp(content_type, "message/rfc822")) {
MsgInfo *msginfo;
MsgFlags flags = {0, 0};
- gchar *name;
+ const gchar *name;
if (procmime_get_encoding_for_file(file) == ENC_7BIT)
ainfo->encoding = ENC_7BIT;
procmsg_msginfo_free(msginfo);
} else {
- if (!g_strncasecmp(content_type, "text", 4))
+ if (!g_ascii_strncasecmp(content_type, "text", 4))
ainfo->encoding =
procmime_get_encoding_for_file(file);
else
ainfo->content_type =
g_strdup("application/octet-stream");
ainfo->encoding = ENC_BASE64;
- } else if (!g_strncasecmp(ainfo->content_type, "text", 4))
+ } else if (!g_ascii_strncasecmp(ainfo->content_type, "text", 4))
ainfo->encoding = procmime_get_encoding_for_file(file);
else
ainfo->encoding = ENC_BASE64;
ainfo->name = g_strdup(g_basename(filename ? filename : file));
}
+
+ if (!strcmp(ainfo->content_type, "unknown")) {
+ g_free(ainfo->content_type);
+ ainfo->content_type = g_strdup("application/octet-stream");
+ }
+
ainfo->size = size;
text[COL_MIMETYPE] = ainfo->content_type;
gtk_clist_set_row_data(GTK_CLIST(compose->attach_clist), row, ainfo);
}
-#define IS_FIRST_PART_TEXT(info) \
- ((info->mime_type == MIME_TEXT || info->mime_type == MIME_TEXT_HTML || \
- info->mime_type == MIME_TEXT_ENRICHED) || \
- (info->mime_type == MIME_MULTIPART && info->content_type && \
- !strcasecmp(info->content_type, "multipart/alternative") && \
- (info->children && \
- (info->children->mime_type == MIME_TEXT || \
- info->children->mime_type == MIME_TEXT_HTML || \
- info->children->mime_type == MIME_TEXT_ENRICHED))))
+static void compose_use_signing(Compose *compose, gboolean use_signing)
+{
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem = NULL;
+
+ compose->use_signing = use_signing;
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Options/Sign");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ use_signing);
+}
+
+static void compose_use_encryption(Compose *compose, gboolean use_encryption)
+{
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem = NULL;
+
+ compose->use_encryption = use_encryption;
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Options/Encrypt");
+
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ use_encryption);
+}
+
+#define NEXT_PART_NOT_CHILD(info) \
+{ \
+ node = info->node; \
+ while (node->children) \
+ node = g_node_last_child(node); \
+ info = procmime_mimeinfo_next((MimeInfo *)node->data); \
+}
static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
{
MimeInfo *mimeinfo;
MimeInfo *child;
- gchar *infile;
+ MimeInfo *firsttext = NULL;
+ MimeInfo *encrypted = NULL;
+ GNode *node;
gchar *outfile;
+ const gchar *partname = NULL;
mimeinfo = procmime_scan_message(msginfo);
if (!mimeinfo) return;
- /* skip first text (presumably message body) */
- child = mimeinfo->children;
- if (!child || IS_FIRST_PART_TEXT(mimeinfo)) {
+ if (mimeinfo->node->children == NULL) {
procmime_mimeinfo_free_all(mimeinfo);
return;
}
- if (IS_FIRST_PART_TEXT(child))
- child = child->next;
-
- infile = procmsg_get_message_file_path(msginfo);
+ /* find first content part */
+ child = (MimeInfo *) mimeinfo->node->children->data;
+ while (child && child->node->children && (child->type == MIMETYPE_MULTIPART))
+ child = (MimeInfo *)child->node->children->data;
+ if (child->type == MIMETYPE_TEXT) {
+ firsttext = child;
+ debug_print("First text part found\n");
+ } else if (compose->mode == COMPOSE_REEDIT &&
+ child->type == MIMETYPE_APPLICATION &&
+ !g_ascii_strcasecmp(child->subtype, "pgp-encrypted")) {
+ AlertValue val;
+ val = alertpanel(_("Encrypted message"),
+ _("Cannot re-edit an encrypted message. \n"
+ "Discard encrypted part?"),
+ _("Yes"), _("No"), NULL);
+ if (val == G_ALERTDEFAULT)
+ encrypted = (MimeInfo *)child->node->parent->data;
+ }
+
+ child = (MimeInfo *) mimeinfo->node->children->data;
while (child != NULL) {
- if (child->children || child->mime_type == MIME_MULTIPART) {
+ if (child == encrypted) {
+ /* skip this part of tree */
+ NEXT_PART_NOT_CHILD(child);
+ continue;
+ }
+
+ if (child->type == MIMETYPE_MULTIPART) {
+ /* get the actual content */
child = procmime_mimeinfo_next(child);
continue;
}
- if (child->parent && child->parent->parent
- && !strcasecmp(child->parent->parent->content_type, "multipart/signed")
- && child->mime_type == MIME_TEXT) {
- /* this is the main text part of a signed message */
+
+ if (child == firsttext) {
child = procmime_mimeinfo_next(child);
continue;
}
+
outfile = procmime_get_tmp_file_name(child);
- if (procmime_get_part(outfile, infile, child) < 0)
+ if (procmime_get_part(outfile, child) < 0)
g_warning("Can't get the part of multipart message.");
- else if (compose->mode != COMPOSE_REEDIT || strcmp(child->content_type, "application/pgp-signature"))
- compose_attach_append
- (compose, outfile,
- child->filename ? child->filename : child->name,
- child->content_type);
-
- child = child->next;
+ else {
+ gchar *content_type;
+
+ content_type = procmime_get_content_type_str(child->type, child->subtype);
+ partname = procmime_mimeinfo_get_parameter(child, "name");
+ if (partname == NULL)
+ partname = "";
+ compose_attach_append(compose, outfile,
+ partname, content_type);
+ g_free(content_type);
+ }
+ g_free(outfile);
+ NEXT_PART_NOT_CHILD(child);
}
-
- g_free(infile);
procmime_mimeinfo_free_all(mimeinfo);
}
-#undef IS_FIRST_PART_TEXT
+
+#define CHAR_BUF_SIZE 8
+#undef NEXT_PART_NOT_CHILD
-#define GET_CHAR(pos, buf, len) \
+#define GET_CHAR(iter_p, buf, len) \
{ \
- if (text->use_wchar) \
- len = wctomb(buf, (wchar_t)GTK_STEXT_INDEX(text, (pos))); \
- else { \
- buf[0] = GTK_STEXT_INDEX(text, (pos)); \
+ 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 DISP_WIDTH(len) \
((len > 2 && conv_get_current_charset() == C_UTF_8) ? 2 : \
(len == 2 && conv_get_current_charset() == C_UTF_8) ? 1 : len)
-#define INDENT_CHARS ">|#"
#define SPACE_CHARS " \t"
static void compose_wrap_line(Compose *compose)
{
- GtkSText *text = GTK_STEXT(compose->text);
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *textbuf = gtk_text_view_get_buffer(text);
+ GtkTextMark *mark;
+ GtkTextIter insert_iter, iter;
gint ch_len, last_ch_len;
- gchar cbuf[MB_LEN_MAX], last_ch;
+ gchar cbuf[CHAR_BUF_SIZE], last_ch;
guint text_len;
- guint line_end;
- guint quoted;
gint p_start, p_end;
gint line_pos, cur_pos;
gint line_len, cur_len;
+ gboolean line_end, quoted;
- gtk_stext_freeze(text);
-
- text_len = gtk_stext_get_length(text);
-
- /* check to see if the point is on the paragraph mark (empty line). */
- cur_pos = gtk_stext_get_point(text);
- GET_CHAR(cur_pos, cbuf, ch_len);
+ text_len = gtk_text_buffer_get_char_count(textbuf);
+ mark = gtk_text_buffer_get_insert(textbuf);
+ gtk_text_buffer_get_iter_at_mark(textbuf, &insert_iter, mark);
+ cur_pos = gtk_text_iter_get_offset(&insert_iter);
+ GET_CHAR(&insert_iter, cbuf, ch_len);
if ((ch_len == 1 && *cbuf == '\n') || cur_pos == text_len) {
+ GtkTextIter prev_iter;
if (cur_pos == 0)
- goto compose_end; /* on the paragraph mark */
- GET_CHAR(cur_pos - 1, cbuf, ch_len);
+ return; /* on the paragraph mark */
+ prev_iter = insert_iter;
+ gtk_text_iter_backward_char(&prev_iter);
+ GET_CHAR(&prev_iter, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n')
- goto compose_end; /* on the paragraph mark */
+ return; /* on the paragraph mark */
}
/* find paragraph start. */
- line_end = quoted = 0;
- for (p_start = cur_pos; p_start >= 0; --p_start) {
- GET_CHAR(p_start, cbuf, ch_len);
+ line_end = quoted = FALSE;
+ for (iter = insert_iter; gtk_text_iter_backward_char(&iter);) {
+ GET_CHAR(&iter, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n') {
if (quoted)
- goto compose_end; /* quoted part */
+ return; /* quoted part */
if (line_end) {
- p_start += 2;
+ gtk_text_iter_forward_chars(&iter, 2);
break;
}
- line_end = 1;
+ line_end = TRUE;
} else {
if (ch_len == 1
&& strchr(prefs_common.quote_chars, *cbuf))
quoted = 1;
- else if (ch_len != 1 || !isspace(*cbuf))
+ else if (ch_len != 1 || !isspace(*(guchar *)cbuf))
quoted = 0;
- line_end = 0;
+ line_end = FALSE;
}
}
- if (p_start < 0)
- p_start = 0;
+ p_start = gtk_text_iter_get_offset(&iter);
/* find paragraph end. */
- line_end = 0;
- for (p_end = cur_pos; p_end < text_len; p_end++) {
- GET_CHAR(p_end, cbuf, ch_len);
+ line_end = FALSE;
+ for (iter = insert_iter; gtk_text_iter_forward_char(&iter);) {
+ GET_CHAR(&iter, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n') {
if (line_end) {
p_end -= 1;
+ gtk_text_iter_backward_char(&iter);
break;
}
- line_end = 1;
+ line_end = TRUE;
} else {
if (line_end && ch_len == 1 &&
strchr(prefs_common.quote_chars, *cbuf))
- goto compose_end; /* quoted part */
+ return; /* quoted part */
- line_end = 0;
+ line_end = FALSE;
}
}
+ p_end = gtk_text_iter_get_offset(&iter);
+
if (p_end >= text_len)
p_end = text_len;
if (p_start >= p_end)
- goto compose_end;
+ return;
line_len = cur_len = 0;
last_ch_len = 0;
last_ch = '\0';
line_pos = p_start;
for (cur_pos = p_start; cur_pos < p_end; cur_pos++) {
- guint space = 0;
+ gboolean space = FALSE;
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cur_pos);
- GET_CHAR(cur_pos, cbuf, ch_len);
+ GET_CHAR(&iter, cbuf, ch_len);
if (ch_len < 0) {
cbuf[0] = '\0';
ch_len = 1;
}
- if (ch_len == 1 && isspace(*cbuf))
+ if (ch_len == 1 && isspace(*(guchar *)cbuf))
space = 1;
if (ch_len == 1 && *cbuf == '\n') {
- guint replace = 0;
- if (last_ch_len == 1 && !isspace(last_ch)) {
+ gboolean replace = FALSE;
+ GtkTextIter next_iter = iter;
+
+ gtk_text_iter_forward_char(&next_iter);
+
+ if (last_ch_len == 1 && !isspace((guchar)last_ch)) {
if (cur_pos + 1 < p_end) {
- GET_CHAR(cur_pos + 1, cbuf, ch_len);
- if (ch_len == 1 && !isspace(*cbuf))
- replace = 1;
+ GET_CHAR(&next_iter, cbuf, ch_len);
+ if (ch_len == 1 &&
+ !isspace(*(guchar *)cbuf))
+ replace = TRUE;
}
}
- gtk_stext_set_point(text, cur_pos + 1);
- gtk_stext_backward_delete(text, 1);
+ gtk_text_buffer_delete(textbuf, &iter, &next_iter);
if (replace) {
- gtk_stext_set_point(text, cur_pos);
- gtk_stext_insert(text, NULL, NULL, NULL, " ", 1);
- space = 1;
+ gtk_text_buffer_insert(textbuf, &iter, " ", 1);
+ space = TRUE;
}
else {
p_end--;
cur_pos--;
+ gtk_text_buffer_get_iter_at_offset
+ (textbuf, &iter, cur_pos);
continue;
}
}
line_len = cur_len + ch_len;
}
- if (cur_len + DISP_WIDTH(ch_len) > prefs_common.linewrap_len &&
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, line_pos);
+
+ if (cur_len + ch_len > prefs_common.linewrap_len &&
line_len > 0) {
gint tlen = ch_len;
+ GtkTextIter prev_iter = iter;
+
+ gtk_text_iter_backward_char(&prev_iter);
- GET_CHAR(line_pos - 1, cbuf, ch_len);
- if (ch_len == 1 && isspace(*cbuf)) {
- gtk_stext_set_point(text, line_pos);
- gtk_stext_backward_delete(text, 1);
+ GET_CHAR(&prev_iter, cbuf, ch_len);
+ if (ch_len == 1 && isspace(*(guchar *)cbuf)) {
+ gtk_text_buffer_delete(textbuf, &prev_iter, &iter);
+ iter = prev_iter;
p_end--;
cur_pos--;
line_pos--;
}
ch_len = tlen;
- gtk_stext_set_point(text, line_pos);
- gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
+ gtk_text_buffer_insert(textbuf, &iter, "\n", 1);
p_end++;
cur_pos++;
line_pos++;
- cur_len = cur_len - line_len + DISP_WIDTH(ch_len);
+ cur_len = cur_len - line_len + ch_len;
line_len = 0;
continue;
}
if (ch_len > 1) {
line_pos = cur_pos + 1;
- line_len = cur_len + DISP_WIDTH(ch_len);
+ line_len = cur_len + ch_len;
}
- cur_len += DISP_WIDTH(ch_len);
+ cur_len += ch_len;
}
-
-compose_end:
- gtk_stext_thaw(text);
}
#undef WRAP_DEBUG
#ifdef WRAP_DEBUG
/* Darko: used when I debug wrapping */
-void dump_text(GtkSText *text, int pos, int tlen, int breakoncr)
+void dump_text(GtkTextBuffer textbuf, int pos, int tlen, int breakoncr)
{
gint i, clen;
- gchar cbuf[MB_LEN_MAX];
+ gchar cbuf[CHAR_BUF_SIZE];
printf("%d [", pos);
- for (i = pos; i < tlen; i++) {
- GET_CHAR(i, cbuf, clen);
+ 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;)
+ GET_CHAR(&iter, cbuf, clen);
if (clen < 0) break;
if (breakoncr && clen == 1 && cbuf[0] == '\n')
break;
uppercase characters immediately followed by >,
and the repeating sequences of the above */
/* return indent length */
-static guint get_indent_length(GtkSText *text, guint start_pos, guint text_len)
+static guint get_indent_length(GtkTextBuffer *textbuf, guint start_pos, guint text_len)
{
guint i_len = 0;
guint i, ch_len, alnum_cnt = 0;
IndentState state = WAIT_FOR_INDENT_CHAR;
- gchar cbuf[MB_LEN_MAX];
+ gchar cbuf[CHAR_BUF_SIZE];
gboolean is_space;
gboolean is_indent;
}
for (i = start_pos; i < text_len; i++) {
- GET_CHAR(i, cbuf, ch_len);
+ GtkTextIter iter;
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, i);
+ GET_CHAR(&iter, cbuf, ch_len);
if (ch_len > 1)
break;
break;
case WAIT_FOR_INDENT_CHAR_OR_SPACE:
if (is_indent == FALSE && is_space == FALSE &&
- !isupper(cbuf[0]))
+ !isupper((guchar)cbuf[0]))
goto out;
if (is_space == TRUE) {
alnum_cnt = 0;
}
break;
case WAIT_FOR_INDENT_CHAR:
- if (is_indent == FALSE && !isupper(cbuf[0]))
+ if (is_indent == FALSE && !isupper((guchar)cbuf[0]))
goto out;
if (is_indent == TRUE) {
if (alnum_cnt > 0
}
/* insert quotation string when line was wrapped */
-static guint ins_quote(GtkSText *text, guint indent_len,
+static guint ins_quote(GtkTextBuffer *textbuf, GtkTextIter *iter,
+ guint indent_len,
guint prev_line_pos, guint text_len,
gchar *quote_fmt)
{
- guint i, ins_len = 0;
- gchar ch;
+ guint ins_len = 0;
if (indent_len) {
- for (i = 0; i < indent_len; i++) {
- ch = GTK_STEXT_INDEX(text, prev_line_pos + i);
- gtk_stext_insert(text, NULL, NULL, NULL, &ch, 1);
- }
- ins_len = indent_len;
+ GtkTextIter iter1, iter2;
+ gchar *text;
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter1,
+ prev_line_pos);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter2,
+ prev_line_pos + indent_len);
+ text = gtk_text_buffer_get_text(textbuf, &iter1, &iter2, FALSE);
+ if (!text) return 0;
+
+ gtk_text_buffer_insert(textbuf, iter, text, -1);
+ ins_len = g_utf8_strlen(text, -1);
+
+ g_free(text);
}
return ins_len;
}
+static gboolean is_sig_separator(Compose *compose, GtkTextBuffer *textbuf, guint start_pos)
+{
+ char *text = NULL;
+ GtkTextIter iter;
+ GtkTextIter end_iter;
+ if (!compose->account->sig_sep)
+ return FALSE;
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, start_pos+1);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+ start_pos+strlen(compose->account->sig_sep)+1);
+
+ if (!strcmp(gtk_text_iter_get_text(&iter, &end_iter),
+ compose->account->sig_sep)) {
+ /* check \n */
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter,
+ start_pos+strlen(compose->account->sig_sep)+1);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+ start_pos+strlen(compose->account->sig_sep)+2);
+
+ if (!strcmp(gtk_text_iter_get_text(&iter, &end_iter),"\n"));
+ return TRUE;
+
+
+ }
+
+ return FALSE;
+}
+
/* check if we should join the next line */
-static gboolean join_next_line(GtkSText *text, guint start_pos, guint tlen,
- guint prev_ilen, gboolean autowrap)
+static gboolean join_next_line_is_needed(GtkTextBuffer *textbuf,
+ guint start_pos, guint tlen,
+ guint prev_ilen, gboolean autowrap)
{
guint indent_len, ch_len;
gboolean do_join = FALSE;
- gchar cbuf[MB_LEN_MAX];
+ gchar cbuf[CHAR_BUF_SIZE];
- indent_len = get_indent_length(text, start_pos, tlen);
+ indent_len = get_indent_length(textbuf, start_pos, tlen);
if ((autowrap || indent_len > 0) && indent_len == prev_ilen) {
- GET_CHAR(start_pos + indent_len, cbuf, ch_len);
+ GtkTextIter iter;
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter,
+ start_pos + indent_len);
+ GET_CHAR(&iter, cbuf, ch_len);
+
if (ch_len > 0 && (cbuf[0] != '\n'))
do_join = TRUE;
}
compose_wrap_line_all_full(compose, FALSE);
}
-#define STEXT_FREEZE() \
- if (!frozen) { gtk_stext_freeze(text); frozen = TRUE; }
-
static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
{
- GtkSText *text = GTK_STEXT(compose->text);
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *textbuf = gtk_text_view_get_buffer(text);
+ GtkTextIter iter, end_iter;
guint tlen;
guint line_pos = 0, cur_pos = 0, p_pos = 0;
gint line_len = 0, cur_len = 0;
gboolean linewrap_quote = TRUE;
gboolean set_editable_pos = FALSE;
gint editable_pos = 0;
- gboolean frozen = FALSE;
guint linewrap_len = prefs_common.linewrap_len;
gchar *qfmt = prefs_common.quotemark;
- gchar cbuf[MB_LEN_MAX];
-
- tlen = gtk_stext_get_length(text);
+ gchar cbuf[CHAR_BUF_SIZE];
+ GtkTextMark *cursor_mark = gtk_text_buffer_get_insert(textbuf);
+
+ tlen = gtk_text_buffer_get_char_count(textbuf);
for (; cur_pos < tlen; cur_pos++) {
/* mark position of new line - needed for quotation wrap */
if (is_new_line) {
if (linewrap_quote)
- i_len = get_indent_length(text, cur_pos, tlen);
+ i_len = get_indent_length(textbuf, cur_pos, tlen);
is_new_line = FALSE;
p_pos = cur_pos;
-#ifdef WRAP_DEBUG
- g_print("new line i_len=%d p_pos=", i_len);
- dump_text(text, p_pos, tlen, 1);
-#endif
}
- GET_CHAR(cur_pos, cbuf, ch_len);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cur_pos);
+ GET_CHAR(&iter, cbuf, ch_len);
/* fix line length for tabs */
if (ch_len == 1 && *cbuf == '\t') {
- guint tab_width = text->default_tab_width;
+ guint tab_width = 8;
guint tab_offset = line_len % tab_width;
-#ifdef WRAP_DEBUG
- g_print("found tab at pos=%d line_len=%d ", cur_pos,
- line_len);
-#endif
- if (tab_offset) {
- line_len += tab_width - tab_offset - 1;
- cur_len = line_len;
- }
-#ifdef WRAP_DEBUG
- printf("new_len=%d\n", line_len);
-#endif
+ line_len += tab_width - tab_offset - 1;
+ cur_len = line_len;
}
/* we have encountered line break */
if (ch_len == 1 && *cbuf == '\n') {
gint clen;
- gchar cb[MB_LEN_MAX];
+ gchar cb[CHAR_BUF_SIZE];
/* should we join the next line */
if ((autowrap || i_len != cur_len) && do_delete &&
- join_next_line
- (text, cur_pos + 1, tlen, i_len, autowrap))
+ !is_sig_separator(compose, textbuf, cur_pos+i_len) &&
+ join_next_line_is_needed
+ (textbuf, cur_pos + 1, tlen, i_len, autowrap)) {
do_delete = TRUE;
- else
+ } else
do_delete = FALSE;
-#ifdef WRAP_DEBUG
- g_print("found CR at %d do_del is %d next line is ",
- cur_pos, do_delete);
- dump_text(text, cur_pos + 1, tlen, 1);
-#endif
-
/* skip delete if it is continuous URL */
if (do_delete && (line_pos - p_pos <= i_len) &&
- gtk_stext_is_uri_string(text, line_pos, tlen))
+ gtkut_text_buffer_is_uri_string(textbuf, line_pos,
+ tlen))
do_delete = FALSE;
-#ifdef WRAP_DEBUG
- g_print("l_len=%d wrap_len=%d do_del=%d\n",
- line_len, linewrap_len, do_delete);
-#endif
/* should we delete to perform smart wrapping */
if (line_len < linewrap_len && do_delete) {
- STEXT_FREEZE();
/* get rid of newline */
- gtk_stext_set_point(text, cur_pos);
- gtk_stext_forward_delete(text, 1);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ cur_pos);
+ end_iter = iter;
+ gtk_text_iter_forward_char(&end_iter);
+ gtk_text_buffer_delete(textbuf, &iter, &end_iter);
tlen--;
/* if text starts with quote fmt or with
indent string, delete them */
if (i_len) {
guint ilen;
- ilen = gtk_stext_str_compare_n
- (text, cur_pos, p_pos, i_len,
+ ilen = gtkut_text_buffer_str_compare_n
+ (textbuf, cur_pos, p_pos, i_len,
tlen);
if (ilen) {
- gtk_stext_forward_delete
- (text, ilen);
+ end_iter = iter;
+ gtk_text_iter_forward_chars
+ (&end_iter, ilen);
+ gtk_text_buffer_delete(textbuf,
+ &iter,
+ &end_iter);
tlen -= ilen;
}
}
- GET_CHAR(cur_pos, cb, clen);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ cur_pos);
+ GET_CHAR(&iter, cb, clen);
/* insert space if it's alphanumeric */
if ((cur_pos != line_pos) &&
- ((clen > 1) || isalnum(cb[0]))) {
- gtk_stext_insert(text, NULL, NULL,
- NULL, " ", 1);
+ ((clen > 1) || isalnum((guchar)cb[0]))) {
+ GtkTextIter cursor_iter;
+ gboolean go_back = FALSE;
+ gtk_text_buffer_get_iter_at_mark(textbuf, &cursor_iter, cursor_mark);
+ if (gtk_text_iter_get_offset(&iter) ==
+ gtk_text_iter_get_offset(&cursor_iter))
+ go_back = TRUE;
+
+ gtk_text_buffer_insert(textbuf, &iter,
+ " ", 1);
+ if (go_back) {
+ gtk_text_buffer_get_iter_at_mark(textbuf, &cursor_iter, cursor_mark);
+ gtk_text_iter_backward_chars(&cursor_iter, 1);
+ gtk_text_buffer_place_cursor(textbuf, &cursor_iter);
+ }
tlen++;
}
dump_text(text, line_pos, tlen, 1);
#endif
/* move beginning of line if we are on LF */
- GET_CHAR(line_pos, cb, clen);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ line_pos);
+ GET_CHAR(&iter, cb, clen);
if (clen == 1 && *cb == '\n')
line_pos++;
#ifdef WRAP_DEBUG
}
/* possible line break */
- if (ch_len == 1 && isspace(*cbuf)) {
+ if (ch_len == 1 && isspace(*(guchar *)cbuf)) {
line_pos = cur_pos + 1;
line_len = cur_len + ch_len;
}
#endif
/* force wrapping if it is one long word but not URL */
if (line_pos - p_pos <= i_len)
- if (!gtk_stext_is_uri_string
- (text, line_pos, tlen))
+ if (!gtkut_text_buffer_is_uri_string
+ (textbuf, line_pos, tlen))
line_pos = cur_pos - 1;
#ifdef WRAP_DEBUG
g_print("new line_pos=%d\n", line_pos);
#endif
- GET_CHAR(line_pos - 1, cbuf, clen);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ line_pos - 1);
+ GET_CHAR(&iter, cbuf, clen);
/* if next character is space delete it */
- if (clen == 1 && isspace(*cbuf)) {
+ if (clen == 1 && isspace(*(guchar *)cbuf)) {
if (p_pos + i_len != line_pos ||
- !gtk_stext_is_uri_string
- (text, line_pos, tlen)) {
- STEXT_FREEZE();
+ !gtkut_text_buffer_is_uri_string
+ (textbuf, line_pos, tlen)) {
/* workaround for correct cursor
position */
if (set_editable_pos == FALSE) {
- editable_pos = gtk_editable_get_position(GTK_EDITABLE(text));
+ GtkTextMark *ins = gtk_text_buffer_get_insert(textbuf);
+ gtk_text_buffer_get_iter_at_mark(textbuf, &iter, ins);
+ editable_pos = gtk_text_iter_get_offset(&iter);
if (editable_pos == line_pos)
set_editable_pos = TRUE;
}
- gtk_stext_set_point(text, line_pos);
- gtk_stext_backward_delete(text, 1);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ line_pos-1);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &end_iter,
+ line_pos);
+ gtk_text_buffer_delete(textbuf, &iter, &end_iter);
+ //gtk_stext_set_point(text, line_pos);
+ //gtk_stext_backward_delete(text, 1);
tlen--;
cur_pos--;
line_pos--;
/* if it is URL at beginning of line don't wrap */
if (p_pos + i_len == line_pos &&
- gtk_stext_is_uri_string(text, line_pos, tlen)) {
+ 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);
}
/* insert CR */
- STEXT_FREEZE();
- gtk_stext_set_point(text, line_pos);
- gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
- gtk_stext_compact_buffer(text);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ line_pos);
+ gtk_text_buffer_insert(textbuf, &iter, "\n", 1);
+ //gtk_stext_set_point(text, line_pos);
+ //gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
+ //gtk_stext_compact_buffer(text);
tlen++;
line_pos++;
/* for loop will increase it */
/* start over with current line */
is_new_line = TRUE;
line_len = cur_len = 0;
- if (autowrap || i_len > 0)
+ if (autowrap || i_len > 0) {
do_delete = TRUE;
- else
+ } else
do_delete = FALSE;
#ifdef WRAP_DEBUG
g_print("after CR insert ");
/* should we insert quotation ? */
if (linewrap_quote && i_len) {
/* only if line is not already quoted */
- if (!gtk_stext_str_compare
- (text, line_pos, tlen, qfmt)) {
+ if (!gtkut_text_buffer_str_compare
+ (textbuf, line_pos, tlen, qfmt)) {
guint ins_len;
-
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, line_pos);
+
if (line_pos - p_pos > i_len) {
ins_len = ins_quote
- (text, i_len, p_pos,
+ (textbuf, &iter, i_len, p_pos,
tlen, qfmt);
tlen += ins_len;
}
if (ch_len > 1) {
line_pos = cur_pos + 1;
- line_len = cur_len + DISP_WIDTH(ch_len);
+ line_len = cur_len + ch_len;
}
/* advance to next character in buffer */
- cur_len += DISP_WIDTH(ch_len);
+ cur_len += ch_len;
}
- if (frozen)
- gtk_stext_thaw(text);
-
- if (set_editable_pos && editable_pos <= tlen)
- gtk_editable_set_position(GTK_EDITABLE(text), editable_pos);
+ if (set_editable_pos && editable_pos <= tlen) {
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, editable_pos);
+ gtk_text_buffer_place_cursor(textbuf, &iter);
+ }
}
-#undef STEXT_FREEZE
#undef GET_CHAR
+#undef CHAR_BUF_SIZE
static void compose_set_title(Compose *compose)
{
static void compose_select_account(Compose *compose, PrefsAccount *account,
gboolean init)
{
- GtkWidget *menuitem;
GtkItemFactory *ifactory;
g_return_if_fail(account != NULL);
gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 4);
compose->use_newsgroups = TRUE;
- menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
- gtk_widget_set_sensitive(menuitem, TRUE);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
- gtk_widget_set_sensitive(menuitem, TRUE);
-
+ menu_set_active(ifactory, "/View/To", FALSE);
+ menu_set_sensitive(ifactory, "/View/To", TRUE);
+ menu_set_active(ifactory, "/View/Cc", FALSE);
+ menu_set_sensitive(ifactory, "/View/Cc", TRUE);
menu_set_sensitive(ifactory, "/View/Followup to", TRUE);
} else {
gtk_widget_hide(compose->newsgroups_hbox);
gtk_widget_queue_resize(compose->table_vbox);
compose->use_newsgroups = FALSE;
- menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_widget_set_sensitive(menuitem, FALSE);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- gtk_widget_set_sensitive(menuitem, FALSE);
-
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Followup to");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
- gtk_widget_set_sensitive(menuitem, FALSE);
+ menu_set_active(ifactory, "/View/To", TRUE);
+ menu_set_sensitive(ifactory, "/View/To", FALSE);
+ menu_set_active(ifactory, "/View/Cc", TRUE);
+ menu_set_sensitive(ifactory, "/View/Cc", FALSE);
+ menu_set_active(ifactory, "/View/Followup to", FALSE);
+ menu_set_sensitive(ifactory, "/View/Followup to", FALSE);
}
if (account->set_autocc) {
COMPOSE_ENTRY_REPLY_TO);
}
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- prefs_common.show_ruler);
#endif
-#if USE_GPGME
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- account->default_sign);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- account->default_encrypt);
+ if (account->default_sign)
+ menu_set_active(ifactory, "/Options/Sign", TRUE);
+ else
+ menu_set_active(ifactory, "/Options/Sign", FALSE);
+ if (account->default_encrypt)
+ menu_set_active(ifactory, "/Options/Encrypt", TRUE);
+ else
+ menu_set_active(ifactory, "/Options/Encrypt", FALSE);
- activate_gnupg_mode(compose, account);
-#endif /* USE_GPGME */
+ activate_privacy_system(compose, account);
if (!init && compose->mode != COMPOSE_REDIRECT)
compose_insert_sig(compose, TRUE);
static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
{
- gchar *str;
+ const gchar *str;
if (compose_check_for_valid_recipient(compose) == FALSE) {
alertpanel_error(_("Recipient is not specified."));
{
gint msgnum;
FolderItem *folder;
- gint val;
+ gint val = -1;
gchar *msgpath;
+ compose_allow_user_actions (compose, FALSE);
+ compose->sending = TRUE;
+
if (compose_check_entries(compose, TRUE) == FALSE)
- return -1;
+ goto bail;
val = compose_queue(compose, &msgnum, &folder);
+
if (val) {
alertpanel_error(_("Could not queue message for sending"));
- return -1;
+ goto bail;
+ }
+
+
+ if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS) {
+ compose->sending = FALSE;
+ gtk_widget_destroy(compose->window);
+ /* No more compose access in the normal codepath
+ * after this point! */
}
if (msgnum == 0) {
- alertpanel_error(_("The message was queued but could not be sent.\nUse \"Send queued messages\" from the main window to retry."));
+ alertpanel_error(_("The message was queued but could not be "
+ "sent.\nUse \"Send queued messages\" from "
+ "the main window to retry."));
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+ compose->sending = FALSE;
+ compose_allow_user_actions (compose, TRUE);
+ }
return 0;
}
val = procmsg_send_message_queue(msgpath);
g_free(msgpath);
- folder_item_remove_msg(folder, msgnum);
-
- folder_item_scan(folder);
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+ compose->sending = FALSE;
+ compose_allow_user_actions (compose, TRUE);
+ if (val != 0) {
+ folder_item_remove_msg(folder, msgnum);
+ folder_item_scan(folder);
+ }
+ }
- return val;
-}
+ if (val == 0) {
+ folder_item_remove_msg(folder, msgnum);
+ folder_item_scan(folder);
+ if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS)
+ gtk_widget_destroy(compose->window);
+ }
-#if 0 /* compose restructure */
-gint compose_send(Compose *compose)
-{
- gchar tmp[MAXPATHLEN + 1];
- gint ok = 0;
- static gboolean lock = FALSE;
-
- if (lock) return 1;
-
- g_return_val_if_fail(compose->account != NULL, -1);
-
- lock = TRUE;
-
- if (compose_check_entries(compose, TRUE) == FALSE) {
- lock = FALSE;
- return 1;
- }
-
- /* write to temporary file */
- g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg.%08x",
- get_tmp_dir(), G_DIR_SEPARATOR, (gint)compose);
-
- if (prefs_common.linewrap_at_send)
- compose_wrap_line_all(compose);
-
- if (compose_write_to_file(compose, tmp, FALSE) < 0) {
- lock = FALSE;
- return -1;
- }
-
- if (!compose->to_list && !compose->newsgroup_list) {
- g_warning("can't get recipient list.");
- unlink(tmp);
- lock = FALSE;
- return -1;
- }
-
- if (compose->to_list) {
- PrefsAccount *ac;
-
-#if 0 /* NEW COMPOSE GUI */
- if (compose->account->protocol != A_NNTP)
- ac = compose->account;
- else {
- ac = account_find_from_address(compose->account->address);
- if (!ac) {
- if (cur_account && cur_account->protocol != A_NNTP)
- ac = cur_account;
- else
- ac = account_get_default();
- }
- if (!ac || ac->protocol == A_NNTP) {
- alertpanel_error(_("Account for sending mail is not specified.\n"
- "Please select a mail account before sending."));
- unlink(tmp);
- lock = FALSE;
- return -1;
- }
- }
-#endif
- ac = compose->account;
-
- ok = send_message(tmp, ac, compose->to_list);
- }
-
- if (ok == 0 && compose->newsgroup_list) {
- ok = news_post(FOLDER(compose->account->folder), tmp);
- if (ok < 0) {
- alertpanel_error(_("Error occurred while posting the message to %s ."),
- compose->account->nntp_server);
- unlink(tmp);
- lock = FALSE;
- return -1;
- }
- }
-
- /* queue message if failed to send */
- if (ok < 0) {
- if (prefs_common.queue_msg) {
- AlertValue val;
-
- val = alertpanel
- (_("Queueing"),
- _("Error occurred while sending the message.\n"
- "Put this message into queue folder?"),
- _("OK"), _("Cancel"), NULL);
- if (G_ALERTDEFAULT == val) {
- ok = compose_queue(compose, tmp);
- if (ok < 0)
- alertpanel_error(_("Can't queue the message."));
- }
- } else
- alertpanel_error_log(_("Error occurred while sending the message."));
- } else {
- if (compose->mode == COMPOSE_REEDIT) {
- compose_remove_reedit_target(compose);
- }
- /* save message to outbox */
- if (prefs_common.savemsg) {
- FolderItem *outbox;
+ return 0;
- outbox = account_get_special_folder
- (compose->account, F_OUTBOX);
- if (procmsg_save_to_outbox(outbox, tmp, FALSE) < 0)
- alertpanel_error
- (_("Can't save the message to Sent."));
- }
- }
+bail:
+ compose_allow_user_actions (compose, TRUE);
+ compose->sending = FALSE;
- unlink(tmp);
- lock = FALSE;
- return ok;
+ return -1;
}
-#endif
static gboolean compose_use_attach(Compose *compose)
{
{
gchar buf[BUFFSIZE];
gchar *str;
- gboolean first_address;
+ gboolean first_to_address;
+ gboolean first_cc_address;
GSList *list;
ComposeHeaderEntry *headerentry;
- gchar *headerentryname;
+ const gchar *headerentryname;
gchar *cc_hdr;
gchar *to_hdr;
cc_hdr = prefs_common.trans_hdr ? _("Cc:") : "Cc:";
to_hdr = prefs_common.trans_hdr ? _("To:") : "To:";
- first_address = TRUE;
+ first_to_address = TRUE;
+ first_cc_address = TRUE;
for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
- if (g_strcasecmp(headerentryname, cc_hdr) == 0
- || g_strcasecmp(headerentryname, to_hdr) == 0) {
- str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
- Xstrdup_a(str, str, return -1);
+ if (g_utf8_collate(headerentryname, cc_hdr) == 0
+ || g_utf8_collate(headerentryname, to_hdr) == 0) {
+ const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ Xstrdup_a(str, entstr, return -1);
g_strstrip(str);
if (str[0] != '\0') {
compose_convert_header
(buf, sizeof(buf), str,
strlen("Resent-To") + 2, TRUE);
- if (first_address) {
- fprintf(fp, "Resent-To: ");
- first_address = FALSE;
- } else {
- fprintf(fp, ",");
+ if (g_utf8_collate(headerentryname, to_hdr) == 0) {
+ if (first_to_address) {
+ fprintf(fp, "Resent-To: ");
+ first_to_address = FALSE;
+ } else {
+ fprintf(fp, ",");
+ }
}
+ if (g_utf8_collate(headerentryname, cc_hdr) == 0) {
+ if (first_cc_address) {
+ fprintf(fp, "\n");
+ fprintf(fp, "Resent-Cc: ");
+ first_cc_address = FALSE;
+ } else {
+ fprintf(fp, ",");
+ }
+ }
+
fprintf(fp, "%s", buf);
}
}
{
gchar buf[BUFFSIZE];
gchar *str;
+ const gchar *entstr;
/* struct utsname utsbuf; */
g_return_val_if_fail(fp != NULL, -1);
fprintf(fp, "Resent-From: %s\n", compose->account->address);
/* Subject */
- str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
+ entstr = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
+ if (*entstr != '\0') {
+ Xstrdup_a(str, entstr, return -1);
g_strstrip(str);
if (*str != '\0') {
compose_convert_header(buf, sizeof(buf), str,
/* Resent-Message-ID */
if (compose->account->gen_msgid) {
- compose_generate_msgid(compose, buf, sizeof(buf));
- fprintf(fp, "Resent-Message-Id: <%s>\n", buf);
+ generate_msgid(compose->account->address, buf, sizeof(buf));
+ fprintf(fp, "Resent-Message-ID: <%s>\n", buf);
compose->msgid = g_strdup(buf);
}
return 0;
}
-static gint compose_redirect_write_to_file(Compose *compose, const gchar *file)
+static gint compose_redirect_write_to_file(Compose *compose, FILE *fdest)
{
FILE *fp;
- FILE *fdest;
size_t len;
gchar buf[BUFFSIZE];
if ((fp = fopen(compose->redirect_filename, "rb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
- return -1;
- }
-
- if ((fdest = fopen(file, "wb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
- fclose(fp);
+ FILE_OP_ERROR(compose->redirect_filename, "fopen");
return -1;
}
- /* chmod for security */
- if (change_file_mode_rw(fdest, file) < 0) {
- FILE_OP_ERROR(file, "chmod");
- g_warning("can't change file mode\n");
- }
-
- while (procheader_get_unfolded_line(buf, sizeof(buf), fp)) {
+ while (procheader_get_one_field_asis(buf, sizeof(buf), fp) != -1) {
/* should filter returnpath, delivered-to */
- if (g_strncasecmp(buf, "Return-Path:",
- strlen("Return-Path:")) == 0 ||
- g_strncasecmp(buf, "Delivered-To:",
- strlen("Delivered-To:")) == 0 ||
- g_strncasecmp(buf, "Received:",
- strlen("Received:")) == 0 ||
- g_strncasecmp(buf, "Subject:",
- strlen("Subject:")) == 0 ||
- g_strncasecmp(buf, "X-UIDL:",
- strlen("X-UIDL:")) == 0)
+ if (g_ascii_strncasecmp(buf, "Return-Path:",
+ strlen("Return-Path:")) == 0 ||
+ g_ascii_strncasecmp(buf, "Delivered-To:",
+ strlen("Delivered-To:")) == 0 ||
+ g_ascii_strncasecmp(buf, "Received:",
+ strlen("Received:")) == 0 ||
+ g_ascii_strncasecmp(buf, "Subject:",
+ strlen("Subject:")) == 0 ||
+ g_ascii_strncasecmp(buf, "X-UIDL:",
+ strlen("X-UIDL:")) == 0)
continue;
if (fputs(buf, fdest) == -1)
goto error;
if (!prefs_common.redirect_keep_from) {
- if (g_strncasecmp(buf, "From:",
+ if (g_ascii_strncasecmp(buf, "From:",
strlen("From:")) == 0) {
fputs(" (by way of ", fdest);
if (compose->account->name
compose_redirect_write_headers(compose, fdest);
while ((len = fread(buf, sizeof(gchar), sizeof(buf), fp)) > 0) {
- if (fwrite(buf, sizeof(gchar), len, fdest) != len) {
- FILE_OP_ERROR(file, "fwrite");
+ if (fwrite(buf, sizeof(gchar), len, fdest) != len)
goto error;
- }
}
fclose(fp);
- if (fclose(fdest) == EOF) {
- FILE_OP_ERROR(file, "fclose");
- unlink(file);
- return -1;
- }
return 0;
- error:
+error:
fclose(fp);
- fclose(fdest);
- unlink(file);
return -1;
}
-
-#if USE_GPGME
-/* interfaces to rfc2015 to keep out the prefs stuff there.
- * returns 0 on success and -1 on error. */
-static gint compose_create_signers_list(Compose *compose, GSList **pkey_list)
-{
- const gchar *key_id = NULL;
- GSList *key_list;
-
- switch (compose->account->sign_key) {
- case SIGN_KEY_DEFAULT:
- *pkey_list = NULL;
- return 0;
- case SIGN_KEY_BY_FROM:
- key_id = compose->account->address;
- break;
- case SIGN_KEY_CUSTOM:
- key_id = compose->account->sign_key_id;
- break;
- default:
- break;
- }
-
- key_list = rfc2015_create_signers_list(key_id);
-
- if (!key_list) {
- alertpanel_error(_("Could not find any key associated with "
- "currently selected key id `%s'."), key_id);
- return -1;
- }
-
- *pkey_list = key_list;
- return 0;
-}
-
-/* clearsign message body text */
-static gint compose_clearsign_text(Compose *compose, gchar **text)
+static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
{
- GSList *key_list;
- gchar *tmp_file;
-
- tmp_file = get_tmp_file();
- if (str_write_to_file(*text, tmp_file) < 0) {
- g_free(tmp_file);
- return -1;
- }
-
- if (compose_create_signers_list(compose, &key_list) < 0 ||
- rfc2015_clearsign(tmp_file, key_list) < 0) {
- unlink(tmp_file);
- g_free(tmp_file);
- return -1;
- }
-
- g_free(*text);
- *text = file_read_to_str(tmp_file);
- unlink(tmp_file);
- g_free(tmp_file);
- if (*text == NULL)
- return -1;
-
- return 0;
-}
-#endif /* USE_GPGME */
-
-static gint compose_write_to_file(Compose *compose, const gchar *file,
- gboolean is_draft)
-{
- FILE *fp;
- size_t len;
+ GtkTextBuffer *buffer;
+ GtkTextIter start, end;
gchar *chars;
gchar *buf;
- gchar *canon_buf;
const gchar *out_codeset;
EncodingType encoding;
+ MimeInfo *mimemsg, *mimetext;
- if ((fp = fopen(file, "wb")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
- return -1;
- }
-
- /* chmod for security */
- if (change_file_mode_rw(fp, file) < 0) {
- FILE_OP_ERROR(file, "chmod");
- g_warning("can't change file mode\n");
- }
+ /* create message MimeInfo */
+ mimemsg = procmime_mimeinfo_new();
+ mimemsg->type = MIMETYPE_MESSAGE;
+ mimemsg->subtype = g_strdup("rfc822");
+ mimemsg->content = MIMECONTENT_MEM;
+ mimemsg->data.mem = compose_get_header(compose);
+ /* Create text part MimeInfo */
/* get all composed text */
- chars = gtk_editable_get_chars(GTK_EDITABLE(compose->text), 0, -1);
- len = strlen(chars);
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
+ gtk_text_buffer_get_start_iter(buffer, &start);
+ gtk_text_buffer_get_end_iter(buffer, &end);
+ chars = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
if (is_ascii_str(chars)) {
buf = chars;
chars = NULL;
const gchar *src_codeset;
out_codeset = conv_get_outgoing_charset_str();
- if (!strcasecmp(out_codeset, CS_US_ASCII))
+ if (!g_ascii_strcasecmp(out_codeset, CS_US_ASCII))
out_codeset = CS_ISO_8859_1;
if (prefs_common.encoding_method == CTE_BASE64)
else
encoding = procmime_get_encoding_for_charset(out_codeset);
-#if USE_GPGME
- if (!is_draft &&
- compose->use_signing && !compose->gnupg_mode &&
- encoding == ENC_8BIT)
- encoding = ENC_BASE64;
-#endif
-
- src_codeset = conv_get_current_charset_str();
+ src_codeset = CS_UTF_8;
/* if current encoding is US-ASCII, set it the same as
outgoing one to prevent code conversion failure */
- if (!strcasecmp(src_codeset, CS_US_ASCII))
+ if (!g_ascii_strcasecmp(src_codeset, CS_US_ASCII))
src_codeset = out_codeset;
debug_print("src encoding = %s, out encoding = %s, transfer encoding = %s\n",
src_codeset, out_codeset, procmime_get_encoding_str(encoding));
- buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
- if (!buf) {
- AlertValue aval;
- gchar *msg;
-
- msg = g_strdup_printf(_("Can't convert the character encoding of the message from\n"
- "%s to %s.\n"
- "Send it anyway?"), src_codeset, out_codeset);
- aval = alertpanel
- (_("Error"), msg, _("Yes"), _("+No"), NULL);
- g_free(msg);
-
- if (aval != G_ALERTDEFAULT) {
- g_free(chars);
- fclose(fp);
- unlink(file);
- return -1;
- } else {
- buf = chars;
- out_codeset = src_codeset;
- chars = NULL;
+ if (action == COMPOSE_WRITE_FOR_SEND) {
+ buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
+ if (!buf) {
+ AlertValue aval;
+ gchar *msg;
+
+ msg = g_strdup_printf(_("Can't convert the character encoding of the message from\n"
+ "%s to %s.\n"
+ "Send it anyway?"), src_codeset, out_codeset);
+ aval = alertpanel_with_type
+ (_("Error"), msg, _("Yes"), _("+No"), NULL, NULL, ALERT_ERROR);
+ g_free(msg);
+
+ if (aval != G_ALERTDEFAULT) {
+ g_free(chars);
+ return -1;
+ } else {
+ buf = chars;
+ out_codeset = src_codeset;
+ chars = NULL;
+ }
}
+ } else {
+ buf = chars;
+ out_codeset = src_codeset;
+ chars = NULL;
}
}
g_free(chars);
- canon_buf = canonicalize_str(buf);
- g_free(buf);
- buf = canon_buf;
-
-#if USE_GPGME
- if (!is_draft && compose->use_signing && compose->gnupg_mode) {
- if (compose_clearsign_text(compose, &buf) < 0) {
- g_warning("clearsign failed\n");
- fclose(fp);
- unlink(file);
- g_free(buf);
- return -1;
- }
- }
-#endif
-
- /* write headers */
- if (compose_write_headers
- (compose, fp, out_codeset, encoding, is_draft) < 0) {
- g_warning("can't write headers\n");
- fclose(fp);
- /* unlink(file); */
- g_free(buf);
- return -1;
- }
-
+ mimetext = procmime_mimeinfo_new();
+ mimetext->content = MIMECONTENT_MEM;
+ mimetext->data.mem = buf;
+ mimetext->type = MIMETYPE_TEXT;
+ mimetext->subtype = g_strdup("plain");
+ g_hash_table_insert(mimetext->typeparameters, g_strdup("charset"),
+ g_strdup(out_codeset));
+ if (encoding != ENC_UNKNOWN)
+ procmime_encode_content(mimetext, encoding);
+
+ /* append attachment parts */
if (compose_use_attach(compose)) {
-#if USE_GPGME
- /* This prolog message is ignored by mime software and
- * because it would make our signing/encryption task
- * tougher, we don't emit it in that case */
- if (!compose->use_signing && !compose->use_encryption)
-#endif
- fputs("This is a multi-part message in MIME format.\n", fp);
-
- fprintf(fp, "\n--%s\n", compose->boundary);
- fprintf(fp, "Content-Type: text/plain; charset=%s\n",
- out_codeset);
-#if USE_GPGME
- if (compose->use_signing && !compose->gnupg_mode)
- fprintf(fp, "Content-Disposition: inline\n");
-#endif
- fprintf(fp, "Content-Transfer-Encoding: %s\n",
- procmime_get_encoding_str(encoding));
- fputc('\n', fp);
- }
+ MimeInfo *mimempart;
- /* write body */
- len = strlen(buf);
- if (encoding == ENC_BASE64) {
- gchar outbuf[B64_BUFFSIZE];
- gint i, l;
-
- for (i = 0; i < len; i += B64_LINE_SIZE) {
- l = MIN(B64_LINE_SIZE, len - i);
- base64_encode(outbuf, buf + i, l);
- fputs(outbuf, fp);
- fputc('\n', fp);
- }
- } else if (encoding == ENC_QUOTED_PRINTABLE) {
- gchar *outbuf;
- size_t outlen;
-
- outbuf = g_malloc(len * 4);
- qp_encode_line(outbuf, buf);
- outlen = strlen(outbuf);
- if (fwrite(outbuf, sizeof(gchar), outlen, fp) != outlen) {
- FILE_OP_ERROR(file, "fwrite");
- fclose(fp);
- unlink(file);
- g_free(outbuf);
- g_free(buf);
- return -1;
- }
- g_free(outbuf);
- } else if (fwrite(buf, sizeof(gchar), len, fp) != len) {
- FILE_OP_ERROR(file, "fwrite");
- fclose(fp);
- unlink(file);
- g_free(buf);
- return -1;
- }
- g_free(buf);
+ mimempart = procmime_mimeinfo_new();
+ mimempart->content = MIMECONTENT_EMPTY;
+ mimempart->type = MIMETYPE_MULTIPART;
+ mimempart->subtype = g_strdup("mixed");
+ g_hash_table_insert(mimempart->typeparameters, g_strdup("boundary"),
+ generate_mime_boundary(NULL));
- if (compose_use_attach(compose))
- compose_write_attach(compose, fp);
+ mimetext->disposition = DISPOSITIONTYPE_INLINE;
- if (fclose(fp) == EOF) {
- FILE_OP_ERROR(file, "fclose");
- unlink(file);
- return -1;
- }
+ g_node_append(mimempart->node, mimetext->node);
+ g_node_append(mimemsg->node, mimempart->node);
-#if USE_GPGME
- if (is_draft) {
- uncanonicalize_file_replace(file);
- return 0;
- }
-
- if ((compose->use_signing && !compose->gnupg_mode) ||
- compose->use_encryption) {
- if (canonicalize_file_replace(file) < 0) {
- unlink(file);
- return -1;
- }
- }
-
- if (compose->use_signing && !compose->gnupg_mode) {
- GSList *key_list;
+ compose_add_attachments(compose, mimempart);
+ } else
+ g_node_append(mimemsg->node, mimetext->node);
- if (compose_create_signers_list(compose, &key_list) < 0 ||
- rfc2015_sign(file, key_list) < 0) {
- unlink(file);
- return -1;
- }
- }
- if (compose->use_encryption) {
- if (rfc2015_encrypt(file, compose->to_list,
- compose->gnupg_mode) < 0) {
- unlink(file);
+ /* 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))
return -1;
- }
- }
-#endif /* USE_GPGME */
- uncanonicalize_file_replace(file);
+ procmime_write_mimeinfo(mimemsg, fp);
return 0;
}
static gint compose_write_body_to_file(Compose *compose, const gchar *file)
{
+ GtkTextBuffer *buffer;
+ GtkTextIter start, end;
FILE *fp;
size_t len;
- gchar *chars;
+ gchar *chars, *tmp;
+ const gchar *src_codeset, *dest_codeset;
if ((fp = fopen(file, "wb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
g_warning("can't change file mode\n");
}
- chars = gtk_editable_get_chars(GTK_EDITABLE(compose->text), 0, -1);
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
+ gtk_text_buffer_get_start_iter(buffer, &start);
+ 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);
+ g_free(tmp);
+ if (!chars) return -1;
/* write body */
len = strlen(chars);
static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gboolean check_subject)
{
FolderItem *queue;
- gchar *tmp, *tmp2;
- FILE *fp, *src_fp;
+ gchar *tmp;
+ FILE *fp;
GSList *cur;
- gchar buf[BUFFSIZE];
gint num;
- MsgFlags flag = {0, 0};
static gboolean lock = FALSE;
PrefsAccount *mailac = NULL, *newsac = NULL;
if (prefs_common.linewrap_at_send)
compose_wrap_line_all(compose);
-
- /* write to temporary file */
- tmp2 = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)compose);
- if (compose->redirect_filename != NULL) {
- if (compose_redirect_write_to_file(compose, tmp2) < 0) {
- unlink(tmp2);
- lock = FALSE;
- return -1;
- }
- }
- else {
- if (compose_write_to_file(compose, tmp2, FALSE) < 0) {
- unlink(tmp2);
- lock = FALSE;
- return -1;
- }
- }
-
- /* add queue header */
- tmp = g_strdup_printf("%s%cqueue.%d", g_get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)compose);
+ /* write queue header */
+ tmp = g_strdup_printf("%s%cqueue.%p", get_tmp_dir(),
+ G_DIR_SEPARATOR, compose);
if ((fp = fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
g_free(tmp);
return -1;
}
- if ((src_fp = fopen(tmp2, "rb")) == NULL) {
- FILE_OP_ERROR(tmp2, "fopen");
- fclose(fp);
- unlink(tmp);
- g_free(tmp);
- unlink(tmp2);
- g_free(tmp2);
- return -1;
- }
+
if (change_file_mode_rw(fp, tmp) < 0) {
FILE_OP_ERROR(tmp, "chmod");
g_warning("can't change file mode\n");
fprintf(fp, "\n");
}
/* Sylpheed account IDs */
- if (mailac) {
+ if (mailac)
fprintf(fp, "MAID:%d\n", mailac->account_id);
- }
- if (newsac) {
+ if (newsac)
fprintf(fp, "NAID:%d\n", newsac->account_id);
+
+ if (compose->privacy_system != NULL) {
+ fprintf(fp, "X-Sylpheed-Privacy-System:%s\n", compose->privacy_system);
+ fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
+ fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
+ if (compose->use_encryption) {
+ gchar *encdata;
+
+ encdata = privacy_get_encrypt_data(compose->privacy_system, compose->to_list);
+ fprintf(fp, "X-Sylpheed-Encrypt-Data:%s\n", encdata);
+ g_free(encdata);
+ }
}
+
/* Save copy folder */
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
gchar *savefolderid;
}
fprintf(fp, "\n");
- while (fgets(buf, sizeof(buf), src_fp) != NULL) {
- if (fputs(buf, fp) == EOF) {
- FILE_OP_ERROR(tmp, "fputs");
+ if (compose->redirect_filename != NULL) {
+ if (compose_redirect_write_to_file(compose, fp) < 0) {
+ lock = FALSE;
+ fclose(fp);
+ unlink(tmp);
+ g_free(tmp);
+ return -1;
+ }
+ } else {
+ if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND) < 0) {
+ lock = FALSE;
fclose(fp);
- fclose(src_fp);
unlink(tmp);
g_free(tmp);
- unlink(tmp2);
- g_free(tmp2);
return -1;
}
}
- fclose(src_fp);
+
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
unlink(tmp);
g_free(tmp);
- unlink(tmp2);
- g_free(tmp2);
return -1;
}
}
unlink(tmp);
g_free(tmp);
- unlink(tmp2);
- g_free(tmp2);
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
return 0;
}
-static void compose_write_attach(Compose *compose, FILE *fp)
+static void compose_add_attachments(Compose *compose, MimeInfo *parent)
{
AttachInfo *ainfo;
GtkCList *clist = GTK_CLIST(compose->attach_clist);
gint row;
- FILE *attach_fp;
- gchar filename[BUFFSIZE];
- gint len;
+ MimeInfo *mimepart;
+ struct stat statbuf;
+ gchar *type, *subtype;
for (row = 0; (ainfo = gtk_clist_get_row_data(clist, row)) != NULL;
row++) {
- if ((attach_fp = fopen(ainfo->file, "rb")) == NULL) {
- g_warning("Can't open file %s\n", ainfo->file);
- continue;
- }
+ mimepart = procmime_mimeinfo_new();
+ mimepart->content = MIMECONTENT_FILE;
+ mimepart->data.filename = g_strdup(ainfo->file);
+ mimepart->offset = 0;
- fprintf(fp, "\n--%s\n", compose->boundary);
-
- if (!strcmp2(ainfo->content_type, "message/rfc822")) {
- fprintf(fp, "Content-Type: %s\n", ainfo->content_type);
- fprintf(fp, "Content-Disposition: inline\n");
- } else {
- compose_convert_header(filename, sizeof(filename),
- ainfo->name, 12, FALSE);
- fprintf(fp, "Content-Type: %s;\n"
- " name=\"%s\"\n",
- ainfo->content_type, filename);
- fprintf(fp, "Content-Disposition: attachment;\n"
- " filename=\"%s\"\n", filename);
- }
+ stat(ainfo->file, &statbuf);
+ mimepart->length = statbuf.st_size;
- fprintf(fp, "Content-Transfer-Encoding: %s\n\n",
- procmime_get_encoding_str(ainfo->encoding));
+ type = g_strdup(ainfo->content_type);
- if (ainfo->encoding == ENC_BASE64) {
- gchar inbuf[B64_LINE_SIZE], outbuf[B64_BUFFSIZE];
+ if (!strchr(type, '/')) {
+ g_free(type);
+ type = g_strdup("application/octet-stream");
+ }
- while ((len = fread(inbuf, sizeof(gchar),
- B64_LINE_SIZE, attach_fp))
- == B64_LINE_SIZE) {
- base64_encode(outbuf, inbuf, B64_LINE_SIZE);
- fputs(outbuf, fp);
- fputc('\n', fp);
- }
- if (len > 0 && feof(attach_fp)) {
- base64_encode(outbuf, inbuf, len);
- fputs(outbuf, fp);
- fputc('\n', fp);
- }
- } else if (ainfo->encoding == ENC_QUOTED_PRINTABLE) {
- gchar inbuf[BUFFSIZE], outbuf[BUFFSIZE * 4];
+ subtype = strchr(type, '/') + 1;
+ *(subtype - 1) = '\0';
+ mimepart->type = procmime_get_media_type(type);
+ mimepart->subtype = g_strdup(subtype);
+ g_free(type);
- while (fgets(inbuf, sizeof(inbuf), attach_fp) != NULL) {
- qp_encode_line(outbuf, inbuf);
- fputs(outbuf, fp);
- }
+ if (mimepart->type == MIMETYPE_MESSAGE &&
+ !g_ascii_strcasecmp(mimepart->subtype, "rfc822")) {
+ mimepart->disposition = DISPOSITIONTYPE_INLINE;
} else {
- gchar buf[BUFFSIZE];
-
- while (fgets(buf, sizeof(buf), attach_fp) != NULL) {
- strcrchomp(buf);
- fputs(buf, fp);
- }
+ g_hash_table_insert(mimepart->typeparameters,
+ g_strdup("name"), g_strdup(ainfo->name));
+ g_hash_table_insert(mimepart->dispositionparameters,
+ g_strdup("filename"), g_strdup(ainfo->name));
+ mimepart->disposition = DISPOSITIONTYPE_ATTACHMENT;
}
- fclose(attach_fp);
- }
-
- fprintf(fp, "\n--%s--\n", compose->boundary);
-}
-
-#define QUOTE_IF_REQUIRED(out, str) \
-{ \
- if (*str != '"' && strpbrk(str, ",.[]<>")) { \
- gchar *__tmp; \
- gint len; \
- \
- len = strlen(str) + 3; \
- Xalloca(__tmp, len, return -1); \
- g_snprintf(__tmp, len, "\"%s\"", str); \
- out = __tmp; \
- } else { \
- Xstrdup_a(out, str, return -1); \
- } \
-}
-
-#define PUT_RECIPIENT_HEADER(header, str) \
-{ \
- if (*str != '\0') { \
- Xstrdup_a(str, str, return -1); \
- g_strstrip(str); \
- if (*str != '\0') { \
- compose->to_list = address_list_append \
- (compose->to_list, str); \
- compose_convert_header \
- (buf, sizeof(buf), str, strlen(header) + 2, \
- TRUE); \
- fprintf(fp, "%s: %s\n", header, buf); \
- } \
- } \
+ procmime_encode_content(mimepart, ainfo->encoding);
+
+ g_node_append(parent->node, mimepart->node);
+ }
+}
+
+#define QUOTE_IF_REQUIRED(out, str) \
+{ \
+ if (*str != '"' && strpbrk(str, ",.[]<>")) { \
+ gchar *__tmp; \
+ gint len; \
+ \
+ len = strlen(str) + 3; \
+ if ((__tmp = alloca(len)) == NULL) { \
+ g_warning("can't allocate memory\n"); \
+ g_string_free(header, TRUE); \
+ return NULL; \
+ } \
+ g_snprintf(__tmp, len, "\"%s\"", str); \
+ out = __tmp; \
+ } else { \
+ gchar *__tmp; \
+ \
+ if ((__tmp = alloca(strlen(str) + 1)) == NULL) { \
+ g_warning("can't allocate memory\n"); \
+ g_string_free(header, TRUE); \
+ return NULL; \
+ } else \
+ strcpy(__tmp, str); \
+ \
+ out = __tmp; \
+ } \
}
#define IS_IN_CUSTOM_HEADER(header) \
(compose->account->add_customhdr && \
custom_header_find(compose->account->customhdr_list, header) != NULL)
-static gint compose_write_headers_from_headerlist(Compose *compose,
- FILE *fp,
- gchar *header)
+static void compose_add_headerfield_from_headerlist(Compose *compose,
+ GString *header,
+ const gchar *fieldname,
+ const gchar *seperator)
{
- gchar buf[BUFFSIZE];
- gchar *str, *header_w_colon, *trans_hdr;
- gboolean first_address;
+ gchar *str, *fieldname_w_colon, *trans_fieldname;
+ gboolean add_field = FALSE;
GSList *list;
ComposeHeaderEntry *headerentry;
- gchar * headerentryname;
+ const gchar * headerentryname;
+ GString *fieldstr;
- if (IS_IN_CUSTOM_HEADER(header)) {
- return 0;
- }
+ if (IS_IN_CUSTOM_HEADER(fieldname))
+ return;
+
+ debug_print("Adding %s-fields\n", fieldname);
- debug_print("Writing %s-header\n", header);
+ fieldstr = g_string_sized_new(64);
- header_w_colon = g_strconcat(header, ":", NULL);
- trans_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
+ fieldname_w_colon = g_strconcat(fieldname, ":", NULL);
+ trans_fieldname = (prefs_common.trans_hdr ? gettext(fieldname_w_colon) : fieldname_w_colon);
- first_address = TRUE;
for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
- if (!g_strcasecmp(trans_hdr, headerentryname)) {
- str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
- Xstrdup_a(str, str, return -1);
+ if (!g_utf8_collate(trans_fieldname, headerentryname)) {
+ str = gtk_editable_get_chars(GTK_EDITABLE(headerentry->entry), 0, -1);
g_strstrip(str);
if (str[0] != '\0') {
- compose_convert_header
- (buf, sizeof(buf), str,
- strlen(header) + 2, TRUE);
- if (first_address) {
- fprintf(fp, "%s: ", header);
- first_address = FALSE;
- } else {
- fprintf(fp, ",");
- }
- fprintf(fp, "%s", buf);
+ if (add_field)
+ g_string_append(fieldstr, seperator);
+ g_string_append(fieldstr, str);
+ add_field = TRUE;
}
+ g_free(str);
}
}
- if (!first_address) {
- fprintf(fp, "\n");
+ if (add_field) {
+ gchar *buf;
+
+ buf = g_new0(gchar, fieldstr->len * 4 + 256);
+ compose_convert_header
+ (buf, fieldstr->len * 4 + 256, fieldstr->str,
+ strlen(fieldname) + 2, TRUE);
+ g_string_append_printf(header, "%s: %s\n", fieldname, buf);
+ g_free(buf);
}
- g_free(header_w_colon);
+ g_free(fieldname_w_colon);
+ g_string_free(fieldstr, TRUE);
- return(0);
+ return;
}
-static gint compose_write_headers(Compose *compose, FILE *fp,
- const gchar *charset, EncodingType encoding,
- gboolean is_draft)
+static gchar *compose_get_header(Compose *compose)
{
gchar buf[BUFFSIZE];
+ const gchar *entry_str;
gchar *str;
gchar *name;
GSList *list;
gchar *std_headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
+ GString *header;
/* struct utsname utsbuf; */
- g_return_val_if_fail(fp != NULL, -1);
- g_return_val_if_fail(charset != NULL, -1);
- g_return_val_if_fail(compose->account != NULL, -1);
- g_return_val_if_fail(compose->account->address != NULL, -1);
+ g_return_val_if_fail(compose->account != NULL, NULL);
+ g_return_val_if_fail(compose->account->address != NULL, NULL);
- /* Save draft infos */
- if (is_draft) {
- fprintf(fp, "X-Sylpheed-Account-Id:%d\n", compose->account->account_id);
- fprintf(fp, "S:%s\n", compose->account->address);
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
- gchar *savefolderid;
-
- savefolderid = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
- fprintf(fp, "SCF:%s\n", savefolderid);
- g_free(savefolderid);
- }
- fprintf(fp, "\n");
- }
+ header = g_string_sized_new(64);
/* Date */
if (compose->account->add_date) {
get_rfc822_date(buf, sizeof(buf));
- fprintf(fp, "Date: %s\n", buf);
+ g_string_append_printf(header, "Date: %s\n", buf);
}
/* From */
- if (!IS_IN_CUSTOM_HEADER("From")) {
- if (compose->account->name && *compose->account->name) {
- compose_convert_header
- (buf, sizeof(buf), compose->account->name,
- strlen("From: "), TRUE);
- QUOTE_IF_REQUIRED(name, buf);
- fprintf(fp, "From: %s <%s>\n",
- name, compose->account->address);
- } else
- fprintf(fp, "From: %s\n", compose->account->address);
- }
+ if (compose->account->name && *compose->account->name) {
+ compose_convert_header
+ (buf, sizeof(buf), compose->account->name,
+ strlen("From: "), TRUE);
+ QUOTE_IF_REQUIRED(name, buf);
+ g_string_append_printf(header, "From: %s <%s>\n",
+ name, compose->account->address);
+ } else
+ g_string_append_printf(header, "From: %s\n", compose->account->address);
/* To */
- compose_write_headers_from_headerlist(compose, fp, "To");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_to) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
- PUT_RECIPIENT_HEADER("To", str);
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "To", ", ");
/* Newsgroups */
- compose_write_headers_from_headerlist(compose, fp, "Newsgroups");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_newsgroups) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
- g_strstrip(str);
- remove_space(str);
- if (*str != '\0') {
- compose->newsgroup_list =
- newsgroup_list_append
- (compose->newsgroup_list, str);
- compose_convert_header(buf, sizeof(buf), str,
- strlen("Newsgroups: "),
- TRUE);
- fprintf(fp, "Newsgroups: %s\n", buf);
- }
- }
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "Newsgroups", ",");
+
/* Cc */
- compose_write_headers_from_headerlist(compose, fp, "Cc");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_cc) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->cc_entry));
- PUT_RECIPIENT_HEADER("Cc", str);
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "Cc", ", ");
+
/* Bcc */
- compose_write_headers_from_headerlist(compose, fp, "Bcc");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_bcc) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->bcc_entry));
- PUT_RECIPIENT_HEADER("Bcc", str);
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "Bcc", ", ");
/* Subject */
str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
if (*str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
- Xstrdup_a(str, str, return -1);
+ gchar *tmpstr;
+
+ tmpstr = g_strdup(str);
+ if (tmpstr == NULL) {
+ g_string_free(header, TRUE);
+ return NULL;
+ }
g_strstrip(str);
if (*str != '\0') {
compose_convert_header(buf, sizeof(buf), str,
strlen("Subject: "), FALSE);
- fprintf(fp, "Subject: %s\n", buf);
+ g_string_append_printf(header, "Subject: %s\n", buf);
}
+ g_free(tmpstr);
}
/* Message-ID */
if (compose->account->gen_msgid) {
- compose_generate_msgid(compose, buf, sizeof(buf));
- fprintf(fp, "Message-Id: <%s>\n", buf);
+ generate_msgid(compose->account->address, buf, sizeof(buf));
+ g_string_append_printf(header, "Message-ID: <%s>\n", buf);
compose->msgid = g_strdup(buf);
}
if (compose->remove_references == FALSE) {
/* In-Reply-To */
if (compose->inreplyto && compose->to_list)
- fprintf(fp, "In-Reply-To: <%s>\n", compose->inreplyto);
+ g_string_append_printf(header, "In-Reply-To: <%s>\n", compose->inreplyto);
/* References */
if (compose->references)
- fprintf(fp, "References: %s\n", compose->references);
+ g_string_append_printf(header, "References: %s\n", compose->references);
}
/* Followup-To */
- compose_write_headers_from_headerlist(compose, fp, "Followup-To");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_followupto && !IS_IN_CUSTOM_HEADER("Followup-To")) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->followup_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
- g_strstrip(str);
- remove_space(str);
- if (*str != '\0') {
- compose_convert_header(buf, sizeof(buf), str,
- strlen("Followup-To: "),
- TRUE);
- fprintf(fp, "Followup-To: %s\n", buf);
- }
- }
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "Followup-To", ",");
+
/* Reply-To */
- compose_write_headers_from_headerlist(compose, fp, "Reply-To");
-#if 0 /* NEW COMPOSE GUI */
- if (compose->use_replyto && !IS_IN_CUSTOM_HEADER("Reply-To")) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->reply_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
- g_strstrip(str);
- if (*str != '\0') {
- compose_convert_header(buf, sizeof(buf), str,
- strlen("Reply-To: "),
- TRUE);
- fprintf(fp, "Reply-To: %s\n", buf);
- }
- }
- }
-#endif
+ compose_add_headerfield_from_headerlist(compose, header, "Reply-To", ", ");
+
/* Organization */
if (compose->account->organization &&
+ strlen(compose->account->organization) &&
!IS_IN_CUSTOM_HEADER("Organization")) {
compose_convert_header(buf, sizeof(buf),
compose->account->organization,
strlen("Organization: "), FALSE);
- fprintf(fp, "Organization: %s\n", buf);
+ g_string_append_printf(header, "Organization: %s\n", buf);
}
/* Program version and system info */
/* uname(&utsbuf); */
if (g_slist_length(compose->to_list) && !IS_IN_CUSTOM_HEADER("X-Mailer") &&
!compose->newsgroup_list) {
- fprintf(fp, "X-Mailer: %s (GTK+ %d.%d.%d; %s)\n",
+ g_string_append_printf(header, "X-Mailer: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
TARGET_ALIAS);
/* utsbuf.sysname, utsbuf.release, utsbuf.machine); */
}
if (g_slist_length(compose->newsgroup_list) && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
- fprintf(fp, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
+ g_string_append_printf(header, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
TARGET_ALIAS);
cur = cur->next) {
CustomHeader *chdr = (CustomHeader *)cur->data;
- if (strcasecmp(chdr->name, "Date") != 0 &&
- strcasecmp(chdr->name, "From") != 0 &&
- strcasecmp(chdr->name, "To") != 0 &&
- /* strcasecmp(chdr->name, "Sender") != 0 && */
- strcasecmp(chdr->name, "Message-Id") != 0 &&
- strcasecmp(chdr->name, "In-Reply-To") != 0 &&
- strcasecmp(chdr->name, "References") != 0 &&
- strcasecmp(chdr->name, "Mime-Version") != 0 &&
- strcasecmp(chdr->name, "Content-Type") != 0 &&
- strcasecmp(chdr->name, "Content-Transfer-Encoding")
- != 0) {
+ if (custom_header_is_allowed(chdr->name)) {
compose_convert_header
(buf, sizeof(buf),
chdr->value ? chdr->value : "",
strlen(chdr->name) + 2, FALSE);
- fprintf(fp, "%s: %s\n", chdr->name, buf);
+ g_string_append_printf(header, "%s: %s\n", chdr->name, buf);
}
}
}
- /* MIME */
- fprintf(fp, "Mime-Version: 1.0\n");
- if (compose_use_attach(compose)) {
- get_rfc822_date(buf, sizeof(buf));
- subst_char(buf, ' ', '_');
- subst_char(buf, ',', '_');
- compose->boundary = g_strdup_printf("Multipart_%s_%08x",
- buf, (guint)compose);
- fprintf(fp,
- "Content-Type: multipart/mixed;\n"
- " boundary=\"%s\"\n", compose->boundary);
- } else {
- fprintf(fp, "Content-Type: text/plain; charset=%s\n", charset);
-#if USE_GPGME
- if (compose->use_signing && !compose->gnupg_mode)
- fprintf(fp, "Content-Disposition: inline\n");
-#endif
- fprintf(fp, "Content-Transfer-Encoding: %s\n",
- procmime_get_encoding_str(encoding));
- }
-
/* PRIORITY */
switch (compose->priority) {
- case PRIORITY_HIGHEST: fprintf(fp, "Importance: high\n"
+ case PRIORITY_HIGHEST: g_string_append_printf(header, "Importance: high\n"
"X-Priority: 1 (Highest)\n");
break;
- case PRIORITY_HIGH: fprintf(fp, "Importance: high\n"
+ case PRIORITY_HIGH: g_string_append_printf(header, "Importance: high\n"
"X-Priority: 2 (High)\n");
break;
case PRIORITY_NORMAL: break;
- case PRIORITY_LOW: fprintf(fp, "Importance: low\n"
+ case PRIORITY_LOW: g_string_append_printf(header, "Importance: low\n"
"X-Priority: 4 (Low)\n");
break;
- case PRIORITY_LOWEST: fprintf(fp, "Importance: low\n"
+ case PRIORITY_LOWEST: g_string_append_printf(header, "Importance: low\n"
"X-Priority: 5 (Lowest)\n");
break;
default: debug_print("compose: priority unknown : %d\n",
compose->account->name,
strlen("Disposition-Notification-To: "),
TRUE);
- fprintf(fp, "Disposition-Notification-To: %s <%s>\n", buf, compose->account->address);
+ g_string_append_printf(header, "Disposition-Notification-To: %s <%s>\n", buf, compose->account->address);
} else
- fprintf(fp, "Disposition-Notification-To: %s\n", compose->account->address);
+ g_string_append_printf(header, "Disposition-Notification-To: %s\n", compose->account->address);
}
}
headerentry = ((ComposeHeaderEntry *)list->data);
tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry)));
+ if (strchr(tmp, ' ') != NULL || strchr(tmp, '\r') != NULL || strchr(tmp, '\n') != NULL) {
+ g_free(tmp);
+ continue;
+ }
+
if (!strstr(tmp, ":")) {
headername_wcolon = g_strconcat(tmp, ":", NULL);
headername = g_strdup(tmp);
}
g_free(tmp);
- headervalue = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ entry_str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ Xstrdup_a(headervalue, entry_str, return -1);
+ subst_char(headervalue, '\r', ' ');
+ subst_char(headervalue, '\n', ' ');
string = std_headers;
while (*string != NULL) {
headername_trans = prefs_common.trans_hdr ? gettext(*string) : *string;
string++;
}
if (!standard_header && !IS_IN_CUSTOM_HEADER(headername))
- fprintf(fp, "%s %s\n", headername_wcolon, headervalue);
+ g_string_append_printf(header, "%s %s\n", headername_wcolon, headervalue);
g_free(headername);
- g_free(headername_wcolon);
-
+ g_free(headername_wcolon);
}
- /* separator between header and body */
- fputs("\n", fp);
+ str = header->str;
+ g_string_free(header, FALSE);
- return 0;
+ return str;
}
#undef IS_IN_CUSTOM_HEADER
static void compose_convert_header(gchar *dest, gint len, gchar *src,
gint header_len, gboolean addr_field)
{
+ gchar *tmpstr = NULL;
+
g_return_if_fail(src != NULL);
g_return_if_fail(dest != NULL);
if (len < 1) return;
- g_strchomp(src);
-
- conv_encode_header(dest, len, src, header_len, addr_field);
-}
-
-static void compose_generate_msgid(Compose *compose, gchar *buf, gint len)
-{
- struct tm *lt;
- time_t t;
- gchar *addr;
-
- t = time(NULL);
- lt = localtime(&t);
-
- if (compose->account && compose->account->address &&
- *compose->account->address) {
- if (strchr(compose->account->address, '@'))
- addr = g_strdup(compose->account->address);
- else
- addr = g_strconcat(compose->account->address, "@",
- get_domain_name(), NULL);
- } else
- addr = g_strconcat(g_get_user_name(), "@", get_domain_name(),
- NULL);
-
- g_snprintf(buf, len, "%04d%02d%02d%02d%02d%02d.%08x.%s",
- lt->tm_year + 1900, lt->tm_mon + 1,
- lt->tm_mday, lt->tm_hour,
- lt->tm_min, lt->tm_sec,
- (guint)random(), addr);
+ tmpstr = g_strdup(src);
- debug_print("generated Message-ID: %s\n", buf);
+ subst_char(tmpstr, '\n', ' ');
+ subst_char(tmpstr, '\r', ' ');
+ g_strchomp(tmpstr);
- g_free(addr);
+ conv_encode_header(dest, len, tmpstr, header_len, addr_field);
+ g_free(tmpstr);
}
static void compose_create_header_entry(Compose *compose)
GtkWidget *combo;
GtkWidget *entry;
GList *combo_list = NULL;
- gchar **string, *header = NULL;
+ gchar **string;
+ const gchar *header = NULL;
ComposeHeaderEntry *headerentry;
gboolean standard_header = FALSE;
gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_list);
g_list_free(combo_list);
gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(combo)->entry), TRUE);
+ g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
gtk_widget_show(combo);
gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0);
if (compose->header_last) {
- gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
+ const gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
string = headers;
while (*string != NULL) {
if (!strcmp(*string, last_header_entry))
if (header)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), header);
+ g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_before_cb), compose);
+ g_signal_connect_after(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
+
/* Entry field */
entry = gtk_entry_new();
gtk_widget_show(entry);
gtk_table_attach(GTK_TABLE(compose->header_table), entry, 1, 2, compose->header_nextrow, compose->header_nextrow+1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
- gtk_signal_connect(GTK_OBJECT(entry), "key-press-event", GTK_SIGNAL_FUNC(compose_headerentry_key_press_event_cb), headerentry);
- gtk_signal_connect(GTK_OBJECT(entry), "changed", GTK_SIGNAL_FUNC(compose_headerentry_changed_cb), headerentry);
- gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(text_activated), compose);
-
+ g_signal_connect(G_OBJECT(entry), "key-press-event",
+ G_CALLBACK(compose_headerentry_key_press_event_cb),
+ headerentry);
+ 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);
address_completion_register_entry(GTK_ENTRY(entry));
headerentry->compose = compose;
gtk_table_set_col_spacings(GTK_TABLE(table), 4);
- gtk_signal_connect(GTK_OBJECT(to_entry), "activate",
- GTK_SIGNAL_FUNC(to_activated), compose);
- gtk_signal_connect(GTK_OBJECT(newsgroups_entry), "activate",
- GTK_SIGNAL_FUNC(newsgroups_activated), compose);
- gtk_signal_connect(GTK_OBJECT(subject_entry), "activate",
- GTK_SIGNAL_FUNC(subject_activated), compose);
- gtk_signal_connect(GTK_OBJECT(cc_entry), "activate",
- GTK_SIGNAL_FUNC(cc_activated), compose);
- gtk_signal_connect(GTK_OBJECT(bcc_entry), "activate",
- GTK_SIGNAL_FUNC(bcc_activated), compose);
- gtk_signal_connect(GTK_OBJECT(reply_entry), "activate",
- GTK_SIGNAL_FUNC(replyto_activated), compose);
- gtk_signal_connect(GTK_OBJECT(followup_entry), "activate",
- GTK_SIGNAL_FUNC(followupto_activated), compose);
-
- gtk_signal_connect(GTK_OBJECT(subject_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(to_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(newsgroups_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(cc_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(bcc_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(reply_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(followup_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
+ g_signal_connect(G_OBJECT(to_entry), "activate",
+ G_CALLBACK(to_activated), compose);
+ g_signal_connect(G_OBJECT(newsgroups_entry), "activate",
+ G_CALLBACK(newsgroups_activated), compose);
+ g_signal_connect(G_OBJECT(subject_entry), "activate",
+ G_CALLBACK(subject_activated), compose);
+ g_signal_connect(G_OBJECT(cc_entry), "activate",
+ G_CALLBACK(cc_activated), compose);
+ g_signal_connect(G_OBJECT(bcc_entry), "activate",
+ G_CALLBACK(bcc_activated), compose);
+ g_signal_connect(G_OBJECT(reply_entry), "activate",
+ G_CALLBACK(replyto_activated), compose);
+ g_signal_connect(G_OBJECT(followup_entry), "activate",
+ G_CALLBACK(followupto_activated), compose);
+
+ g_signal_connect(G_OBJECT(subject_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
+ g_signal_connect(G_OBJECT(to_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
+ g_signal_connect(G_OBJECT(newsgroups_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
+ g_signal_connect(G_OBJECT(cc_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
+ g_signal_connect(G_OBJECT(bcc_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
+ g_signal_connect(G_OBJECT(reply_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
+ g_signal_connect(G_OBJECT(followup_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
#endif
compose->table = NULL;
attach_scrwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(attach_scrwin),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
- gtk_widget_set_usize(attach_scrwin, -1, 80);
+ 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_CAN_FOCUS);
gtk_container_add(GTK_CONTAINER(attach_scrwin), attach_clist);
- gtk_signal_connect(GTK_OBJECT(attach_clist), "select_row",
- GTK_SIGNAL_FUNC(attach_selected), compose);
- gtk_signal_connect(GTK_OBJECT(attach_clist), "button_press_event",
- GTK_SIGNAL_FUNC(attach_button_pressed), compose);
- gtk_signal_connect(GTK_OBJECT(attach_clist), "key_press_event",
- GTK_SIGNAL_FUNC(attach_key_pressed), compose);
+ g_signal_connect(G_OBJECT(attach_clist), "select_row",
+ G_CALLBACK(attach_selected), compose);
+ g_signal_connect(G_OBJECT(attach_clist), "button_press_event",
+ G_CALLBACK(attach_button_pressed), compose);
+ g_signal_connect(G_OBJECT(attach_clist), "key_press_event",
+ G_CALLBACK(attach_key_pressed), compose);
/* drag and drop */
gtk_drag_dest_set(attach_clist,
GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
GDK_ACTION_COPY | GDK_ACTION_MOVE);
- gtk_signal_connect(GTK_OBJECT(attach_clist), "drag_data_received",
- GTK_SIGNAL_FUNC(compose_attach_drag_received_cb),
- compose);
+ g_signal_connect(G_OBJECT(attach_clist), "drag_data_received",
+ G_CALLBACK(compose_attach_drag_received_cb),
+ compose);
compose->attach_scrwin = attach_scrwin;
compose->attach_clist = attach_clist;
if (account_get_special_folder(compose->account, F_OUTBOX)) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(savemsg_checkbtn), prefs_common.savemsg);
}
- gtk_signal_connect(GTK_OBJECT(savemsg_checkbtn), "toggled",
- GTK_SIGNAL_FUNC(compose_savemsg_checkbtn_cb), compose);
+ g_signal_connect(G_OBJECT(savemsg_checkbtn), "toggled",
+ G_CALLBACK(compose_savemsg_checkbtn_cb), compose);
savemsg_entry = gtk_entry_new();
gtk_widget_show(savemsg_entry);
gtk_table_attach_defaults(GTK_TABLE(table), savemsg_entry, 1, 2, rowcount, rowcount + 1);
gtk_editable_set_editable(GTK_EDITABLE(savemsg_entry), prefs_common.savemsg);
+ g_signal_connect(G_OBJECT(savemsg_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_before_cb), compose);
+ g_signal_connect_after(G_OBJECT(savemsg_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
if (account_get_special_folder(compose->account, F_OUTBOX)) {
folderidentifier = folder_item_get_identifier(account_get_special_folder
(compose->account, F_OUTBOX));
}
savemsg_select = gtk_button_new_with_label (_("Select ..."));
- gtk_widget_show (savemsg_select);
+ gtk_widget_show(savemsg_select);
gtk_table_attach(GTK_TABLE(table), savemsg_select, 2, 3, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
- gtk_signal_connect (GTK_OBJECT (savemsg_select), "clicked",
- GTK_SIGNAL_FUNC (compose_savemsg_select_cb),
- compose);
+ g_signal_connect(G_OBJECT(savemsg_select), "clicked",
+ G_CALLBACK(compose_savemsg_select_cb),
+ compose);
rowcount++;
GtkWidget *ruler;
GtkWidget *scrolledwin;
GtkWidget *text;
+ GtkTextBuffer *buffer;
+ GtkClipboard *clipboard;
UndoMain *undostruct;
compose->account = account;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
- gtk_widget_set_usize(window, -1, prefs_common.compose_height);
- gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");
+ gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+ gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
if (!geometry.max_width) {
geometry.max_width = gdk_screen_width();
}
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
&geometry, GDK_HINT_MAX_SIZE);
-
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(compose_delete_cb), compose);
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
- GTK_SIGNAL_FUNC(compose_destroy_cb), compose);
+ if (!geometry.min_width) {
+ geometry.min_width = 600;
+ geometry.min_height = 480;
+ }
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
+ &geometry, GDK_HINT_MIN_SIZE);
+ gtk_widget_set_uposition(window, prefs_common.compose_x,
+ prefs_common.compose_y);
+
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(compose_delete_cb), compose);
+ g_signal_connect(G_OBJECT(window), "destroy",
+ G_CALLBACK(compose_destroy_cb), compose);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
gtk_widget_realize(window);
/* Notebook */
notebook = gtk_notebook_new();
- gtk_widget_set_usize(notebook, -1, 130);
+ gtk_widget_set_size_request(notebook, -1, 130);
gtk_widget_show(notebook);
/* header labels and entries */
subject_entry = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 2);
- gtk_signal_connect(GTK_OBJECT(subject_entry), "activate", GTK_SIGNAL_FUNC(text_activated), compose);
+ 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",
+ G_CALLBACK(compose_grab_focus_cb), compose);
gtk_widget_show(subject_entry);
compose->subject_entry = subject_entry;
gtk_container_add(GTK_CONTAINER(subject_frame), subject);
edit_vbox = gtk_vbox_new(FALSE, 0);
-#if 0 /* NEW COMPOSE GUI */
- gtk_box_pack_start(GTK_BOX(vbox2), edit_vbox, TRUE, TRUE, 0);
-#endif
gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0);
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_usize(ruler_hbox, 1, -1);
+ gtk_widget_set_size_request(ruler_hbox, 1, -1);
/* text widget */
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
- GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(edit_vbox), scrolledwin, TRUE, TRUE, 0);
- gtk_widget_set_usize(scrolledwin, prefs_common.compose_width, -1);
-
- text = gtk_stext_new(gtk_scrolled_window_get_hadjustment
- (GTK_SCROLLED_WINDOW(scrolledwin)),
- gtk_scrolled_window_get_vadjustment
- (GTK_SCROLLED_WINDOW(scrolledwin)));
- GTK_STEXT(text)->default_tab_width = 8;
- gtk_stext_set_editable(GTK_STEXT(text), TRUE);
-
- if (prefs_common.block_cursor) {
- GTK_STEXT(text)->cursor_type = GTK_STEXT_CURSOR_BLOCK;
- }
+ gtk_widget_set_size_request(scrolledwin, prefs_common.compose_width, -1);
+
+ text = gtk_text_view_new();
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(text), TRUE);
+ clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+ gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
- if (prefs_common.smart_wrapping) {
- gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
- gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
- }
-
gtk_container_add(GTK_CONTAINER(scrolledwin), text);
- gtk_signal_connect(GTK_OBJECT(text), "changed",
- GTK_SIGNAL_FUNC(compose_changed_cb), compose);
- gtk_signal_connect(GTK_OBJECT(text), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(text), "activate",
- GTK_SIGNAL_FUNC(text_activated), compose);
- gtk_signal_connect(GTK_OBJECT(text), "insert_text",
- GTK_SIGNAL_FUNC(text_inserted), compose);
- gtk_signal_connect_after(GTK_OBJECT(text), "button_press_event",
- GTK_SIGNAL_FUNC(compose_button_press_cb),
- edit_vbox);
-#if 0
- gtk_signal_connect_after(GTK_OBJECT(text), "key_press_event",
- GTK_SIGNAL_FUNC(compose_key_press_cb),
- compose);
-#endif
- gtk_signal_connect_after(GTK_OBJECT(text), "size_allocate",
- GTK_SIGNAL_FUNC(compose_edit_size_alloc),
- ruler);
+ g_signal_connect_after(G_OBJECT(text), "size_allocate",
+ G_CALLBACK(compose_edit_size_alloc),
+ ruler);
+ g_signal_connect(G_OBJECT(buffer), "changed",
+ 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_CALLBACK(text_inserted), compose);
/* drag and drop */
gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
GDK_ACTION_COPY | GDK_ACTION_MOVE);
- gtk_signal_connect(GTK_OBJECT(text), "drag_data_received",
- GTK_SIGNAL_FUNC(compose_insert_drag_received_cb),
- compose);
+ g_signal_connect(G_OBJECT(text), "drag_data_received",
+ G_CALLBACK(compose_insert_drag_received_cb),
+ compose);
gtk_widget_show_all(vbox);
/* pane between attach clist and text */
paned = gtk_vpaned_new();
gtk_paned_set_gutter_size(GTK_PANED(paned), 12);
- gtk_paned_set_handle_size(GTK_PANED(paned), 12);
gtk_container_add(GTK_CONTAINER(vbox2), paned);
gtk_paned_add1(GTK_PANED(paned), notebook);
gtk_paned_add2(GTK_PANED(paned), edit_vbox);
style = gtk_widget_get_style(text);
- /* workaround for the slow down of GtkSText when using Pixmap theme */
- if (style->engine) {
- GtkThemeEngine *engine;
-
- engine = style->engine;
- style->engine = NULL;
- new_style = gtk_style_copy(style);
- style->engine = engine;
- } else
- new_style = gtk_style_copy(style);
+ new_style = gtk_style_copy(style);
if (prefs_common.textfont) {
- GdkFont *font;
-
- if ((font = gtkut_font_load(prefs_common.textfont)) != NULL) {
- gdk_font_unref(new_style->font);
- new_style->font = font;
+ PangoFontDescription *font_desc;
+
+ font_desc = pango_font_description_from_string
+ (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;
}
}
ifactory = gtk_item_factory_from_widget(menubar);
menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
- menu_set_sensitive(ifactory, "/Message/Remove references", FALSE);
+ menu_set_sensitive(ifactory, "/Options/Remove references", FALSE);
tmpl_menu = gtk_item_factory_get_item(ifactory, "/Tools/Template");
-#if 0 /* NEW COMPOSE GUI */
- gtk_widget_hide(bcc_hbox);
- gtk_widget_hide(bcc_entry);
- gtk_widget_hide(reply_hbox);
- gtk_widget_hide(reply_entry);
- gtk_widget_hide(followup_hbox);
- gtk_widget_hide(followup_entry);
- gtk_widget_hide(ruler_hbox);
- gtk_table_set_row_spacing(GTK_TABLE(table), 4, 0);
- gtk_table_set_row_spacing(GTK_TABLE(table), 5, 0);
- gtk_table_set_row_spacing(GTK_TABLE(table), 6, 0);
-
- if (account->protocol == A_NNTP) {
- gtk_widget_hide(to_hbox);
- gtk_widget_hide(to_entry);
- gtk_widget_hide(cc_hbox);
- gtk_widget_hide(cc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(table), 1, 0);
- gtk_table_set_row_spacing(GTK_TABLE(table), 3, 0);
- } else {
- gtk_widget_hide(newsgroups_hbox);
- gtk_widget_hide(newsgroups_entry);
- gtk_table_set_row_spacing(GTK_TABLE(table), 2, 0);
- }
-#endif
-
- action_update_compose_menu(ifactory, compose);
-
undostruct = undo_init(text);
undo_set_change_state_func(undostruct, &compose_undo_state_changed,
compose->msgid = NULL;
compose->boundary = NULL;
-#if USE_GPGME
+ compose->autowrap = prefs_common.autowrap;
+
compose->use_signing = FALSE;
compose->use_encryption = FALSE;
-#endif /* USE_GPGME */
+ compose->privacy_system = NULL;
compose->modified = FALSE;
compose->exteditor_pid = -1;
compose->exteditor_readdes = -1;
compose->exteditor_tag = -1;
+ compose->draft_timeout_tag = -1;
#if USE_ASPELL
menu_set_sensitive(ifactory, "/Spelling", FALSE);
prefs_common.misspelled_col,
prefs_common.check_while_typing,
prefs_common.use_alternate,
- GTK_STEXT(text));
+ GTK_TEXT_VIEW(text),
+ GTK_WINDOW(compose->window));
if (!gtkaspell) {
alertpanel_error(_("Spell checker could not "
"be started.\n%s"),
}
}
}
+ compose->gtkaspell = gtkaspell;
#endif
compose_select_account(compose, account, TRUE);
-#if USE_ASPELL
- compose->gtkaspell = gtkaspell;
-#endif
-
+ menu_set_active(ifactory, "/Edit/Auto wrapping", prefs_common.autowrap);
if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_cc, COMPOSE_CC);
- if (account->set_autobcc)
+ if (account->set_autobcc && account->auto_bcc && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_bcc, COMPOSE_BCC);
if (account->set_autoreplyto && account->auto_replyto && mode != COMPOSE_REEDIT)
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:");
addressbook_set_target_compose(compose);
- action_update_compose_menu(ifactory, compose);
if (mode != COMPOSE_REDIRECT)
compose_set_template_menu(compose);
/* Priority */
compose->priority = PRIORITY_NORMAL;
compose_update_priority_menu_item(compose);
-
-#if USE_GPGME
- activate_gnupg_mode(compose, account);
-#endif
+
+ /* Actions menu */
+ compose_update_actions_menu(compose);
+
+ /* Privacy Systems menu */
+ compose_update_privacy_systems_menu(compose);
+
+ activate_privacy_system(compose, account);
toolbar_set_style(compose->toolbar->toolbar, compose->handlebox, prefs_common.toolbar_style);
gtk_widget_show(window);
ac->account_name, ac->address);
MENUITEM_ADD(menu, menuitem, name, ac->account_id);
g_free(name);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(account_activated),
- compose);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(account_activated),
+ compose);
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
switch (compose->priority) {
case PRIORITY_HIGHEST:
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Priority/Highest");
+ (ifactory, "/Options/Priority/Highest");
break;
case PRIORITY_HIGH:
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Priority/High");
+ (ifactory, "/Options/Priority/High");
break;
case PRIORITY_NORMAL:
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Priority/Normal");
+ (ifactory, "/Options/Priority/Normal");
break;
case PRIORITY_LOW:
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Priority/Low");
+ (ifactory, "/Options/Priority/Low");
break;
case PRIORITY_LOWEST:
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Priority/Lowest");
+ (ifactory, "/Options/Priority/Lowest");
break;
}
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
-#if USE_GPGME
-static void compose_set_gnupg_mode_cb(gpointer data,
- guint action,
- GtkWidget *widget)
+static void compose_set_privacy_system_cb(gpointer data,
+ guint action,
+ GtkWidget *widget)
{
Compose *compose = (Compose *) data;
- compose->gnupg_mode = action;
+ gchar *systemid;
+ GtkItemFactory *ifactory;
+ gboolean can_sign = FALSE, can_encrypt = FALSE;
+
+ systemid = g_object_get_data(G_OBJECT(widget), "privacy_system");
+ g_free(compose->privacy_system);
+ compose->privacy_system = NULL;
+ if (systemid != NULL) {
+ compose->privacy_system = g_strdup(systemid);
+
+ can_sign = privacy_system_can_sign(systemid);
+ can_encrypt = privacy_system_can_encrypt(systemid);
+ }
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menu_set_sensitive(ifactory, "/Options/Sign", can_sign);
+ menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
}
-static void compose_update_gnupg_mode_menu_item(Compose * compose)
+static void compose_update_privacy_system_menu_item(Compose * compose)
{
+ static gchar *branch_path = "/Options/Privacy System";
GtkItemFactory *ifactory;
GtkWidget *menuitem = NULL;
+ GList *amenu;
+ gboolean can_sign = FALSE, can_encrypt = FALSE;
ifactory = gtk_item_factory_from_widget(compose->menubar);
-
- switch (compose->gnupg_mode) {
- case GNUPG_MODE_DETACH:
- menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Mode/MIME");
- break;
- case GNUPG_MODE_INLINE:
- menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Mode/Inline");
- break;
+
+ if (compose->privacy_system != NULL) {
+ gchar *systemid;
+
+ menuitem = gtk_item_factory_get_widget(ifactory, branch_path);
+ g_return_if_fail(menuitem != NULL);
+
+ amenu = GTK_MENU_SHELL(menuitem)->children;
+ menuitem = NULL;
+ while (amenu != NULL) {
+ GList *alist = amenu->next;
+
+ systemid = g_object_get_data(G_OBJECT(amenu->data), "privacy_system");
+ if (systemid != NULL)
+ if (strcmp(systemid, compose->privacy_system) == 0) {
+ menuitem = GTK_WIDGET(amenu->data);
+
+ can_sign = privacy_system_can_sign(systemid);
+ can_encrypt = privacy_system_can_encrypt(systemid);
+
+ break;
+ }
+
+ amenu = alist;
+ }
+ if (menuitem != NULL)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-
- if (compose->use_encryption == TRUE || compose->use_signing == TRUE)
- menu_set_sensitive(ifactory, "/Message/Mode", TRUE);
- else
- menu_set_sensitive(ifactory, "/Message/Mode", FALSE);
+
+ menu_set_sensitive(ifactory, "/Options/Sign", can_sign);
+ menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
}
-#endif
static void compose_set_template_menu(Compose *compose)
{
GtkWidget *menu;
GtkWidget *item;
- tmpl_list = template_get_config();
+ tmpl_list = template_get_config();
+
+ menu = gtk_menu_new();
+
+ for (cur = tmpl_list; cur != NULL; cur = cur->next) {
+ Template *tmpl = (Template *)cur->data;
+
+ item = gtk_menu_item_new_with_label(tmpl->name);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(compose_template_activate_cb),
+ compose);
+ g_object_set_data(G_OBJECT(item), "template", tmpl);
+ gtk_widget_show(item);
+ }
+
+ gtk_widget_show(menu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->tmpl_menu), menu);
+}
+
+void compose_update_actions_menu(Compose *compose)
+{
+ GtkItemFactory *ifactory;
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ action_update_compose_menu(ifactory, "/Tools/Actions", compose);
+}
- menu = gtk_menu_new();
+void compose_update_privacy_systems_menu(Compose *compose)
+{
+ static gchar *branch_path = "/Options/Privacy System";
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem;
+ gchar *menu_path;
+ GSList *systems, *cur;
+ GList *amenu;
+ GtkItemFactoryEntry ifentry = {NULL, NULL, NULL, 0, "<Branch>"};
+ GtkWidget *widget;
- for (cur = tmpl_list; cur != NULL; cur = cur->next) {
- Template *tmpl = (Template *)cur->data;
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
- item = gtk_menu_item_new_with_label(tmpl->name);
- gtk_menu_append(GTK_MENU(menu), item);
- gtk_signal_connect(GTK_OBJECT(item), "activate",
- GTK_SIGNAL_FUNC(compose_template_activate_cb),
- compose);
- gtk_object_set_data(GTK_OBJECT(item), "template", tmpl);
- gtk_widget_show(item);
+ /* remove old entries */
+ ifentry.path = branch_path;
+ menuitem = gtk_item_factory_get_widget(ifactory, branch_path);
+ g_return_if_fail(menuitem != NULL);
+
+ amenu = GTK_MENU_SHELL(menuitem)->children->next;
+ while (amenu != NULL) {
+ GList *alist = amenu->next;
+ gtk_widget_destroy(GTK_WIDGET(amenu->data));
+ amenu = alist;
}
- gtk_widget_show(menu);
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->tmpl_menu), menu);
+ ifentry.accelerator = NULL;
+ ifentry.callback_action = 0;
+ ifentry.callback = compose_set_privacy_system_cb;
+ ifentry.item_type = "/Options/Privacy System/None";
+
+ 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);
+
+ g_object_set_data_full(G_OBJECT(widget), "privacy_system",
+ g_strdup(systemid), g_free);
+
+ g_free(systemid);
+ g_free(menu_path);
+ }
+ g_slist_free(systems);
}
void compose_reflect_prefs_all(void)
static void compose_template_apply(Compose *compose, Template *tmpl,
gboolean replace)
{
+ GtkTextView *text;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter iter;
gchar *qmark;
gchar *parsed_str;
if (!tmpl || !tmpl->value) return;
- gtk_stext_freeze(GTK_STEXT(compose->text));
+ text = GTK_TEXT_VIEW(compose->text);
+ buffer = gtk_text_view_get_buffer(text);
if (tmpl->subject && *tmpl->subject != '\0')
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
if (replace)
- gtkut_stext_clear(GTK_STEXT(compose->text));
+ gtk_text_buffer_set_text(buffer, "\0", 1);
+
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
compose_insert_sig(compose, FALSE);
if (replace && parsed_str) {
- gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
- gtk_stext_set_point(GTK_STEXT(compose->text), 0);
+ gtk_text_buffer_get_start_iter(buffer, &iter);
+ gtk_text_buffer_place_cursor(buffer, &iter);
}
if (parsed_str)
compose_changed_cb(NULL, compose);
-
- gtk_stext_thaw(GTK_STEXT(compose->text));
}
static void compose_destroy(Compose *compose)
ainfo->name ? ainfo->name : "");
for (;;) {
+ const gchar *entry_text;
gchar *text;
gchar *cnttype = NULL;
gchar *file = NULL;
break;
}
- text = gtk_entry_get_text(GTK_ENTRY(attach_prop.mimetype_entry));
- if (*text != '\0') {
+ entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.mimetype_entry));
+ if (*entry_text != '\0') {
gchar *p;
- text = g_strstrip(g_strdup(text));
+ text = g_strstrip(g_strdup(entry_text));
if ((p = strchr(text, '/')) && !strchr(p + 1, '/')) {
cnttype = g_strdup(text);
g_free(text);
menu = gtk_option_menu_get_menu(optmenu);
menuitem = gtk_menu_get_active(GTK_MENU(menu));
ainfo->encoding = GPOINTER_TO_INT
- (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
- text = gtk_entry_get_text(GTK_ENTRY(attach_prop.path_entry));
- if (*text != '\0') {
- if (is_file_exist(text) &&
- (size = get_file_size(text)) > 0)
- file = g_strdup(text);
+ entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.path_entry));
+ if (*entry_text != '\0') {
+ if (is_file_exist(entry_text) &&
+ (size = get_file_size(entry_text)) > 0)
+ file = g_strdup(entry_text);
else {
alertpanel_error
(_("File doesn't exist or is empty."));
}
}
- text = gtk_entry_get_text(GTK_ENTRY(attach_prop.filename_entry));
- if (*text != '\0') {
+ entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.filename_entry));
+ if (*entry_text != '\0') {
g_free(ainfo->name);
- ainfo->name = g_strdup(text);
+ ainfo->name = g_strdup(entry_text);
}
if (cnttype) {
debug_print("Creating attach_property window...\n");
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_widget_set_usize(window, 480, -1);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_widget_set_size_request(window, 480, -1);
gtk_container_set_border_width(GTK_CONTAINER(window), 8);
gtk_window_set_title(GTK_WINDOW(window), _("Properties"));
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(attach_property_delete_event),
- cancelled);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(attach_property_key_pressed),
- cancelled);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(attach_property_delete_event),
+ cancelled);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(attach_property_key_pressed),
+ cancelled);
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(attach_property_ok),
- cancelled);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(attach_property_cancel),
- cancelled);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(attach_property_ok),
+ cancelled);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(attach_property_cancel),
+ cancelled);
gtk_widget_show_all(vbox);
return TRUE;
}
-static void attach_property_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gboolean *cancelled)
+static gboolean attach_property_key_pressed(GtkWidget *widget,
+ GdkEventKey *event,
+ gboolean *cancelled)
{
if (event && event->keyval == GDK_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
+ return FALSE;
}
static void compose_exec_ext_editor(Compose *compose)
pid_t pid;
gint pipe_fds[2];
- tmp = g_strdup_printf("%s%ctmpmsg.%08x", get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)compose);
+ tmp = g_strdup_printf("%s%ctmpmsg.%p", get_tmp_dir(),
+ G_DIR_SEPARATOR, compose);
if (pipe(pipe_fds) < 0) {
perror("pipe");
waitpid(compose->exteditor_pid, NULL, 0);
if (buf[0] == '0') { /* success */
- GtkSText *text = GTK_STEXT(compose->text);
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
- gtk_stext_freeze(text);
- gtk_stext_set_point(text, 0);
- gtk_stext_forward_delete(text, gtk_stext_get_length(text));
+ gtk_text_buffer_set_text(buffer, "\0", 1);
compose_insert_file(compose, compose->exteditor_file);
compose_changed_cb(NULL, compose);
- gtk_stext_thaw(text);
if (unlink(compose->exteditor_file) < 0)
FILE_OP_ERROR(compose->exteditor_file, "unlink");
menu_set_sensitive(ifactory, "/Message/Send", sensitive);
menu_set_sensitive(ifactory, "/Message/Send later", sensitive);
- menu_set_sensitive(ifactory, "/Message/Save to draft folder",
- sensitive);
- menu_set_sensitive(ifactory, "/File/Insert file", sensitive);
- menu_set_sensitive(ifactory, "/File/Insert signature", sensitive);
+ menu_set_sensitive(ifactory, "/Message/Insert file", sensitive);
+ menu_set_sensitive(ifactory, "/Message/Insert signature", sensitive);
menu_set_sensitive(ifactory, "/Edit/Wrap current paragraph", sensitive);
menu_set_sensitive(ifactory, "/Edit/Wrap all long lines", sensitive);
menu_set_sensitive(ifactory, "/Edit/Edit with external editor",
gtk_widget_set_sensitive(compose->toolbar->insert_btn, sensitive);
gtk_widget_set_sensitive(compose->toolbar->sig_btn, sensitive);
gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
- gtk_widget_set_sensitive(compose->toolbar->linewrap_btn, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
+ gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
}
/**
g_return_if_fail(widget != NULL);
- debug_print("Set_undo. UNDO:%i REDO:%i\n", undo_state, redo_state);
-
ifactory = gtk_item_factory_from_widget(widget);
switch (undo_state) {
case UNDO_STATE_TRUE:
if (!undostruct->undo_state) {
- debug_print ("Set_undo - Testpoint\n");
undostruct->undo_state = TRUE;
menu_set_sensitive(ifactory, "/Edit/Undo", TRUE);
}
}
}
-static gint calc_cursor_xpos(GtkSText *text, gint extra, gint char_width)
+static gint calc_cursor_xpos(GtkTextView *text, gint extra, gint char_width)
{
- gint cursor_pos;
-
- cursor_pos = (text->cursor_pos_x - extra) / char_width;
- cursor_pos = MAX(cursor_pos, 0);
-
- return cursor_pos;
+#warning FIXME_GTK2
+ return 0;
}
/* callback functions */
GtkSHRuler *shruler)
{
if (prefs_common.show_ruler) {
- gint char_width;
+ gint char_width = 0, char_height = 0;
gint line_width_in_chars;
- char_width = gtkut_get_font_width
- (GTK_WIDGET(widget)->style->font);
+ gtkut_get_font_size(GTK_WIDGET(widget),
+ &char_width, &char_height);
line_width_in_chars =
(allocation->width - allocation->x) / char_width;
/* got the maximum */
gtk_ruler_set_range(GTK_RULER(shruler),
0.0, line_width_in_chars,
- calc_cursor_xpos(GTK_STEXT(widget),
+ calc_cursor_xpos(GTK_TEXT_VIEW(widget),
allocation->x,
char_width),
/*line_width_in_chars*/ char_width);
Compose *compose = (Compose *)data;
PrefsAccount *ac;
+ gchar *folderidentifier;
ac = account_find_from_id(
- GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem))));
+ GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID)));
g_return_if_fail(ac != NULL);
if (ac != compose->account)
compose_select_account(compose, ac, FALSE);
+
+ /* Set message save folder */
+ if (account_get_special_folder(compose->account, F_OUTBOX)) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
+ }
+ g_signal_connect(G_OBJECT(compose->savemsg_checkbtn), "toggled",
+ G_CALLBACK(compose_savemsg_checkbtn_cb), compose);
+
+ gtk_editable_delete_text(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+ if (account_get_special_folder(compose->account, F_OUTBOX)) {
+ folderidentifier = folder_item_get_identifier(account_get_special_folder
+ (compose->account, F_OUTBOX));
+ gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
+ g_free(folderidentifier);
+ }
}
static void attach_selected(GtkCList *clist, gint row, gint column,
compose_attach_property(compose);
}
-static void attach_button_pressed(GtkWidget *widget, GdkEventButton *event,
- gpointer data)
+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;
- if (!event) return;
+ if (!event) return FALSE;
if (event->button == 3) {
if ((clist->selection && !clist->selection->next) ||
gtk_menu_popup(GTK_MENU(compose->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
}
+
+ return FALSE;
}
-static void attach_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
+static gboolean attach_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
{
Compose *compose = (Compose *)data;
- if (!event) return;
+ if (!event) return FALSE;
switch (event->keyval) {
case GDK_Delete:
compose_attach_remove_selected(compose);
break;
}
+ return FALSE;
}
static void compose_allow_user_actions (Compose *compose, gboolean allow)
{
GtkItemFactory *ifactory = gtk_item_factory_from_widget(compose->menubar);
toolbar_comp_set_sensitive(compose, allow);
- menu_set_sensitive(ifactory, "/File", allow);
+ menu_set_sensitive(ifactory, "/Message", allow);
menu_set_sensitive(ifactory, "/Edit", allow);
#if USE_ASPELL
menu_set_sensitive(ifactory, "/Spelling", allow);
#endif
- menu_set_sensitive(ifactory, "/Message", allow);
+ menu_set_sensitive(ifactory, "/Options", allow);
menu_set_sensitive(ifactory, "/Tools", allow);
menu_set_sensitive(ifactory, "/Help", allow);
}
static void compose_send_cb(gpointer data, guint action, GtkWidget *widget)
{
Compose *compose = (Compose *)data;
- gint val;
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
return;
- compose_allow_user_actions (compose, FALSE);
- compose->sending = TRUE;
- val = compose_send(compose);
- compose_allow_user_actions (compose, TRUE);
- compose->sending = FALSE;
+ if (compose->draft_timeout_tag != -1) { /* CLAWS: disable draft timeout */
+ gtk_timeout_remove(compose->draft_timeout_tag);
+ compose->draft_timeout_tag = -1;
+ }
- if (val == 0) gtk_widget_destroy(compose->window);
+ compose_send(compose);
}
static void compose_send_later_cb(gpointer data, guint action,
void compose_draft (gpointer data)
{
- compose_draft_cb(data, 0, NULL);
+ compose_draft_cb(data, COMPOSE_QUIT_EDITING, NULL);
}
static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
MsgFlags flag = {0, 0};
static gboolean lock = FALSE;
MsgInfo *newmsginfo;
+ FILE *fp;
if (lock) return;
lock = TRUE;
- tmp = g_strdup_printf("%s%cdraft.%08x", get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)compose);
+ tmp = g_strdup_printf("%s%cdraft.%p", get_tmp_dir(),
+ G_DIR_SEPARATOR, compose);
+ if ((fp = fopen(tmp, "wb")) == NULL) {
+ FILE_OP_ERROR(tmp, "fopen");
+ return;
+ }
+
+ /* chmod for security */
+ if (change_file_mode_rw(fp, tmp) < 0) {
+ FILE_OP_ERROR(tmp, "chmod");
+ g_warning("can't change file mode\n");
+ }
+
+ /* Save draft infos */
+ fprintf(fp, "X-Sylpheed-Account-Id:%d\n", compose->account->account_id);
+ fprintf(fp, "S:%s\n", compose->account->address);
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
+ gchar *savefolderid;
+
+ savefolderid = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+ fprintf(fp, "SCF:%s\n", savefolderid);
+ g_free(savefolderid);
+ }
+ 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, "\n");
- if (compose_write_to_file(compose, tmp, TRUE) < 0) {
+ if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE) < 0) {
+ fclose(fp);
+ unlink(tmp);
g_free(tmp);
lock = FALSE;
return;
}
+ fclose(fp);
folder_item_scan(draft);
if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
if (newmsginfo) {
procmsg_msginfo_unset_flags(newmsginfo, ~0, ~0);
procmsg_msginfo_set_flags(newmsginfo, 0, MSG_DRAFT);
+ if (compose_use_attach(compose))
+ procmsg_msginfo_set_flags(newmsginfo, 0,
+ MSG_HAS_ATTACHMENT);
+
procmsg_msginfo_free(newmsginfo);
}
lock = FALSE;
- /* 0: quit editing 1: keep editing 2: keep editing (autosave) */
- if (action == 0)
+ if (action == COMPOSE_QUIT_EDITING)
gtk_widget_destroy(compose->window);
else {
struct stat s;
compose->targetinfo->folder = draft;
compose->mode = COMPOSE_REEDIT;
- if (action == 2) {
+ if (action == COMPOSE_AUTO_SAVE) {
compose->autosaved_draft = compose->targetinfo;
}
}
if (compose->redirect_filename != NULL)
return;
- file_list = filesel_select_multiple_files(_("Select file"), NULL);
+ file_list = filesel_select_multiple_files_open(_("Select file"));
if (file_list) {
GList *tmp;
Compose *compose = (Compose *)data;
GList *file_list;
- file_list = filesel_select_multiple_files(_("Select file"), NULL);
+ file_list = filesel_select_multiple_files_open(_("Select file"));
if (file_list) {
GList *tmp;
for ( tmp = file_list; tmp; tmp = tmp->next) {
gchar *file = (gchar *) tmp->data;
- compose_insert_file(compose, file);
+ gchar *filedup = g_strdup(file);
+ const gchar *shortfile = g_basename(filedup);
+ ComposeInsertResult res;
+
+ res = compose_insert_file(compose, file);
+ if (res == COMPOSE_INSERT_READ_ERROR) {
+ alertpanel_error(_("File '%s' could not be read."), shortfile);
+ } else if (res == COMPOSE_INSERT_INVALID_CHARACTER) {
+ alertpanel_error(_("File '%s' contained invalid characters\n"
+ "for the current encoding, insertion may be incorrect."), shortfile);
+ }
+ g_free(filedup);
g_free(file);
}
g_list_free(file_list);
static gint compose_delete_cb(GtkWidget *widget, GdkEventAny *event,
gpointer data)
{
+ gint x, y;
Compose *compose = (Compose *)data;
+
+ gtkut_widget_get_uposition(widget, &x, &y);
+ prefs_common.compose_x = x;
+ prefs_common.compose_y = y;
+
if (compose->sending)
return TRUE;
compose_close_cb(compose, 0, NULL);
{
Compose *compose = (Compose *)data;
AlertValue val;
-
+
if (compose->exteditor_tag != -1) {
if (!compose_ext_editor_kill(compose))
return;
compose_remove_draft(compose);
break;
case G_ALERTALTERNATE:
- compose_draft_cb(data, 0, NULL);
+ compose_draft_cb(data, COMPOSE_QUIT_EDITING, NULL);
return;
default:
return;
gchar *msg;
AlertValue val;
- tmpl = gtk_object_get_data(GTK_OBJECT(widget), "template");
+ tmpl = g_object_get_data(G_OBJECT(widget), "template");
g_return_if_fail(tmpl != NULL);
msg = g_strdup_printf(_("Do you want to apply the template `%s' ?"),
undo_redo(compose->undostruct);
}
+static void entry_cut_clipboard(GtkWidget *entry)
+{
+ if (GTK_IS_EDITABLE(entry))
+ gtk_editable_cut_clipboard (GTK_EDITABLE(entry));
+ else if (GTK_IS_TEXT_VIEW(entry))
+ gtk_text_buffer_cut_clipboard(
+ gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry)),
+ gtk_clipboard_get(GDK_NONE),
+ TRUE);
+}
+
+static void entry_copy_clipboard(GtkWidget *entry)
+{
+ if (GTK_IS_EDITABLE(entry))
+ gtk_editable_copy_clipboard (GTK_EDITABLE(entry));
+ else if (GTK_IS_TEXT_VIEW(entry))
+ gtk_text_buffer_copy_clipboard(
+ gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry)),
+ gtk_clipboard_get(GDK_NONE));
+}
+
+static void entry_paste_clipboard(GtkWidget *entry)
+{
+ if (GTK_IS_EDITABLE(entry))
+ gtk_editable_paste_clipboard (GTK_EDITABLE(entry));
+ else if (GTK_IS_TEXT_VIEW(entry))
+ gtk_text_buffer_paste_clipboard(
+ gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry)),
+ gtk_clipboard_get(GDK_NONE),
+ NULL, TRUE);
+}
+
+static void entry_allsel(GtkWidget *entry)
+{
+ if (GTK_IS_EDITABLE(entry))
+ gtk_editable_select_region(GTK_EDITABLE(entry), 0, -1);
+ else if (GTK_IS_TEXT_VIEW(entry)) {
+ GtkTextIter startiter, enditer;
+ GtkTextBuffer *textbuf;
+
+ textbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry));
+ gtk_text_buffer_get_start_iter(textbuf, &startiter);
+ gtk_text_buffer_get_end_iter(textbuf, &enditer);
+
+ gtk_text_buffer_move_mark_by_name(textbuf,
+ "selection_bound", &startiter);
+ gtk_text_buffer_move_mark_by_name(textbuf,
+ "insert", &enditer);
+ }
+}
+
+
static void compose_cut_cb(Compose *compose)
{
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- gtk_editable_cut_clipboard
- (GTK_EDITABLE(compose->focused_editable));
+ entry_cut_clipboard(compose->focused_editable);
}
static void compose_copy_cb(Compose *compose)
{
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- gtk_editable_copy_clipboard
- (GTK_EDITABLE(compose->focused_editable));
+ entry_copy_clipboard(compose->focused_editable);
}
static void compose_paste_cb(Compose *compose)
{
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- gtk_editable_paste_clipboard
- (GTK_EDITABLE(compose->focused_editable));
+ entry_paste_clipboard(compose->focused_editable);
}
static void compose_paste_as_quote_cb(Compose *compose)
* after the gtk_editable_paste_clipboard) know that
* text is to be inserted as a quotation. implemented
* by using a simple refcount... */
- gint paste_as_quotation = GPOINTER_TO_INT(gtk_object_get_data(
- GTK_OBJECT(compose->focused_editable),
+ gint paste_as_quotation = GPOINTER_TO_INT(g_object_get_data(
+ G_OBJECT(compose->focused_editable),
"paste_as_quotation"));
- gtk_object_set_data(GTK_OBJECT(compose->focused_editable),
+ g_object_set_data(G_OBJECT(compose->focused_editable),
"paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation + 1));
- gtk_editable_paste_clipboard
- (GTK_EDITABLE(compose->focused_editable));
+ entry_paste_clipboard(compose->focused_editable);
}
}
{
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- gtk_editable_select_region
- (GTK_EDITABLE(compose->focused_editable), 0, -1);
+ entry_allsel(compose->focused_editable);
}
-static void compose_gtk_stext_action_cb(Compose *compose,
- ComposeCallGtkSTextAction action)
+static void textview_move_beginning_of_line (GtkTextView *text)
{
- GtkSText *text = GTK_STEXT(compose->text);
- static struct {
- void (*do_action) (GtkSText *text);
- } action_table[] = {
- {gtk_stext_move_beginning_of_line},
- {gtk_stext_move_forward_character},
- {gtk_stext_move_backward_character},
- {gtk_stext_move_forward_word},
- {gtk_stext_move_backward_word},
- {gtk_stext_move_end_of_line},
- {gtk_stext_move_next_line},
- {gtk_stext_move_previous_line},
- {gtk_stext_delete_forward_character},
- {gtk_stext_delete_backward_character},
- {gtk_stext_delete_forward_word},
- {gtk_stext_delete_backward_word},
- {gtk_stext_delete_line},
- {gtk_stext_delete_line}, /* gtk_stext_delete_line_n */
- {gtk_stext_delete_to_line_end}
- };
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
- if (!GTK_WIDGET_HAS_FOCUS(text)) return;
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
- if (action >= COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE &&
- action <= COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END)
- action_table[action].do_action(text);
+ 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);
+ gtk_text_iter_set_line_offset(&ins, 0);
+ gtk_text_buffer_place_cursor(buffer, &ins);
}
-static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
+static void textview_move_forward_character (GtkTextView *text)
{
- if (GTK_IS_EDITABLE(widget))
- compose->focused_editable = widget;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ if (gtk_text_iter_forward_cursor_position(&ins))
+ gtk_text_buffer_place_cursor(buffer, &ins);
}
-static void compose_changed_cb(GtkEditable *editable, Compose *compose)
+static void textview_move_backward_character (GtkTextView *text)
{
- if (compose->modified == FALSE) {
- compose->modified = TRUE;
- compose_set_title(compose);
- }
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ if (gtk_text_iter_backward_cursor_position(&ins))
+ gtk_text_buffer_place_cursor(buffer, &ins);
}
-static void compose_button_press_cb(GtkWidget *widget, GdkEventButton *event,
- Compose *compose)
+static void textview_move_forward_word (GtkTextView *text)
{
- gtk_stext_set_point(GTK_STEXT(widget),
- gtk_editable_get_position(GTK_EDITABLE(widget)));
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+ gint count;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ count = gtk_text_iter_inside_word (&ins) ? 2 : 1;
+ if (gtk_text_iter_forward_word_ends(&ins, count)) {
+ gtk_text_iter_backward_word_start(&ins);
+ gtk_text_buffer_place_cursor(buffer, &ins);
+ }
}
-#if 0
-static void compose_key_press_cb(GtkWidget *widget, GdkEventKey *event,
- Compose *compose)
+static void textview_move_backward_word (GtkTextView *text)
{
- gtk_stext_set_point(GTK_STEXT(widget),
- gtk_editable_get_position(GTK_EDITABLE(widget)));
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+ gint count;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ count = gtk_text_iter_inside_word (&ins) ? 2 : 1;
+ if (gtk_text_iter_backward_word_starts(&ins, 1))
+ gtk_text_buffer_place_cursor(buffer, &ins);
}
-#endif
-#if 0 /* NEW COMPOSE GUI */
-static void compose_toggle_to_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void textview_move_end_of_line (GtkTextView *text)
{
- Compose *compose = (Compose *)data;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_show(compose->to_hbox);
- gtk_widget_show(compose->to_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 1, 4);
- compose->use_to = TRUE;
- } else {
- gtk_widget_hide(compose->to_hbox);
- gtk_widget_hide(compose->to_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 1, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_to = FALSE;
- }
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
- if (addressbook_get_target_compose() == compose)
- addressbook_set_target_compose(compose);
+ 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);
+ if (gtk_text_iter_forward_to_line_end(&ins))
+ gtk_text_buffer_place_cursor(buffer, &ins);
}
-static void compose_toggle_cc_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void textview_move_next_line (GtkTextView *text)
{
- Compose *compose = (Compose *)data;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+ gint offset;
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_show(compose->cc_hbox);
- gtk_widget_show(compose->cc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 3, 4);
- compose->use_cc = TRUE;
- } else {
- gtk_widget_hide(compose->cc_hbox);
- gtk_widget_hide(compose->cc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 3, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_cc = FALSE;
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ gtk_text_buffer_place_cursor(buffer, &ins);
}
+}
- if (addressbook_get_target_compose() == compose)
- addressbook_set_target_compose(compose);
+static void textview_move_previous_line (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+ gint offset;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ gtk_text_buffer_place_cursor(buffer, &ins);
+ }
}
-static void compose_toggle_bcc_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void textview_delete_forward_character (GtkTextView *text)
{
- Compose *compose = (Compose *)data;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, end_iter;
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_show(compose->bcc_hbox);
- gtk_widget_show(compose->bcc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 4, 4);
- compose->use_bcc = TRUE;
- } else {
- gtk_widget_hide(compose->bcc_hbox);
- gtk_widget_hide(compose->bcc_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 4, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_bcc = FALSE;
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ end_iter = ins;
+ if (gtk_text_iter_forward_char(&end_iter)) {
+ gtk_text_buffer_delete(buffer, &ins, &end_iter);
}
+}
- if (addressbook_get_target_compose() == compose)
- addressbook_set_target_compose(compose);
+static void textview_delete_backward_character (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, end_iter;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ end_iter = ins;
+ if (gtk_text_iter_backward_char(&end_iter)) {
+ gtk_text_buffer_delete(buffer, &end_iter, &ins);
+ }
}
-static void compose_toggle_replyto_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void textview_delete_forward_word (GtkTextView *text)
{
- Compose *compose = (Compose *)data;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, end_iter;
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_show(compose->reply_hbox);
- gtk_widget_show(compose->reply_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 5, 4);
- compose->use_replyto = TRUE;
- } else {
- gtk_widget_hide(compose->reply_hbox);
- gtk_widget_hide(compose->reply_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 5, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_replyto = FALSE;
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ end_iter = ins;
+ if (gtk_text_iter_forward_word_end(&end_iter)) {
+ gtk_text_buffer_delete(buffer, &ins, &end_iter);
}
}
-static void compose_toggle_followupto_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void textview_delete_backward_word (GtkTextView *text)
{
- Compose *compose = (Compose *)data;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, end_iter;
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_show(compose->followup_hbox);
- gtk_widget_show(compose->followup_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 6, 4);
- compose->use_followupto = TRUE;
- } else {
- gtk_widget_hide(compose->followup_hbox);
- gtk_widget_hide(compose->followup_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 6, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_followupto = FALSE;
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ end_iter = ins;
+ if (gtk_text_iter_backward_word_start(&end_iter)) {
+ gtk_text_buffer_delete(buffer, &end_iter, &ins);
}
}
-static void compose_toggle_attach_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void textview_delete_line (GtkTextView *text)
{
- Compose *compose = (Compose *)data;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, start_iter, end_iter;
+ gboolean found;
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- gtk_widget_ref(compose->edit_vbox);
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
- gtkut_container_remove(GTK_CONTAINER(compose->vbox2),
- compose->edit_vbox);
- gtk_paned_add2(GTK_PANED(compose->paned), compose->edit_vbox);
- gtk_box_pack_start(GTK_BOX(compose->vbox2), compose->paned,
- TRUE, TRUE, 0);
- gtk_widget_show(compose->paned);
+ 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);
- gtk_widget_unref(compose->edit_vbox);
- gtk_widget_unref(compose->paned);
+ start_iter = ins;
+ gtk_text_iter_set_line_offset(&start_iter, 0);
- compose->use_attach = TRUE;
- } else {
- gtk_widget_ref(compose->paned);
- gtk_widget_ref(compose->edit_vbox);
+ end_iter = ins;
+ if (gtk_text_iter_ends_line(&end_iter))
+ found = gtk_text_iter_forward_char(&end_iter);
+ else
+ found = gtk_text_iter_forward_to_line_end(&end_iter);
+
+ if (found)
+ gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
+}
+
+static void textview_delete_to_line_end (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, end_iter;
+ gboolean found;
- gtkut_container_remove(GTK_CONTAINER(compose->vbox2),
- compose->paned);
- gtkut_container_remove(GTK_CONTAINER(compose->paned),
- compose->edit_vbox);
- gtk_box_pack_start(GTK_BOX(compose->vbox2),
- compose->edit_vbox, TRUE, TRUE, 0);
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ 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);
+ end_iter = ins;
+ if (gtk_text_iter_ends_line(&end_iter))
+ found = gtk_text_iter_forward_char(&end_iter);
+ else
+ found = gtk_text_iter_forward_to_line_end(&end_iter);
+ if (found)
+ gtk_text_buffer_delete(buffer, &ins, &end_iter);
+}
+
+static void compose_advanced_action_cb(Compose *compose,
+ ComposeCallAdvancedAction action)
+{
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ static struct {
+ void (*do_action) (GtkTextView *text);
+ } action_table[] = {
+ {textview_move_beginning_of_line},
+ {textview_move_forward_character},
+ {textview_move_backward_character},
+ {textview_move_forward_word},
+ {textview_move_backward_word},
+ {textview_move_end_of_line},
+ {textview_move_next_line},
+ {textview_move_previous_line},
+ {textview_delete_forward_character},
+ {textview_delete_backward_character},
+ {textview_delete_forward_word},
+ {textview_delete_backward_word},
+ {textview_delete_line},
+ {NULL}, /* gtk_stext_delete_line_n */
+ {textview_delete_to_line_end}
+ };
- gtk_widget_unref(compose->edit_vbox);
+ if (!GTK_WIDGET_HAS_FOCUS(text)) return;
- compose->use_attach = FALSE;
+ if (action >= COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE &&
+ action <= COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END) {
+ if (action_table[action].do_action)
+ action_table[action].do_action(text);
+ else
+ g_warning("Not implemented yet.");
}
}
-#endif
-#if USE_GPGME
+static gchar *cliptext = NULL;
+
+static gboolean compose_grab_focus_before_cb(GtkWidget *widget, Compose *compose)
+{
+ gchar *str = NULL;
+ GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
+ if (cliptext)
+ g_free(cliptext);
+ 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)
+{
+ gchar *str = NULL;
+ GtkClipboard *clip = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
+
+ if (GTK_IS_EDITABLE(widget)) {
+ str = gtk_editable_get_chars(GTK_EDITABLE(widget), 0, -1);
+ gtk_editable_set_position(GTK_EDITABLE(widget),
+ strlen(str));
+ g_free(str);
+ }
+ if (cliptext)
+ gtk_clipboard_set_text(clip, cliptext, -1);
+
+ 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)
+{
+ if (compose->modified == FALSE) {
+ compose->modified = TRUE;
+ compose_set_title(compose);
+ }
+}
+
+static void compose_toggle_autowrap_cb(gpointer data, guint action,
+ GtkWidget *widget)
+{
+ Compose *compose = (Compose *)data;
+ compose->autowrap = GTK_CHECK_MENU_ITEM(widget)->active;
+ if (compose->autowrap)
+ compose_wrap_line_all_full(compose, TRUE);
+}
+
static void compose_toggle_sign_cb(gpointer data, guint action,
GtkWidget *widget)
{
compose->use_signing = TRUE;
else
compose->use_signing = FALSE;
-
- compose_update_gnupg_mode_menu_item(compose);
}
static void compose_toggle_encrypt_cb(gpointer data, guint action,
compose->use_encryption = TRUE;
else
compose->use_encryption = FALSE;
-
- compose_update_gnupg_mode_menu_item(compose);
}
-static void activate_gnupg_mode (Compose *compose, PrefsAccount *account)
+static void activate_privacy_system(Compose *compose, PrefsAccount *account)
{
- if (account->default_gnupg_mode)
- compose->gnupg_mode = GNUPG_MODE_INLINE;
- else
- compose->gnupg_mode = GNUPG_MODE_DETACH;
-
- compose_update_gnupg_mode_menu_item(compose);
+ g_free(compose->privacy_system);
+ compose->privacy_system = g_strdup(account->default_privacy_system);
+ compose_update_privacy_system_menu_item(compose);
}
-#endif /* USE_GPGME */
static void compose_toggle_ruler_cb(gpointer data, guint action,
GtkWidget *widget)
compose->remove_references = FALSE;
}
-void compose_headerentry_key_press_event_cb(GtkWidget *entry,
+gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
GdkEventKey *event,
ComposeHeaderEntry *headerentry)
{
/* Override default next focus, and give it to subject_entry
* instead of notebook tabs
*/
- gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key-press-event");
+ g_signal_stop_emission_by_name(G_OBJECT(entry), "key-press-event");
gtk_widget_grab_focus(headerentry->compose->subject_entry);
+ return TRUE;
}
}
-
+ return FALSE;
}
-void compose_headerentry_changed_cb(GtkWidget *entry,
+gboolean compose_headerentry_changed_cb(GtkWidget *entry,
ComposeHeaderEntry *headerentry)
{
if (strlen(gtk_entry_get_text(GTK_ENTRY(entry))) != 0) {
headerentry->compose->header_list =
g_slist_append(headerentry->compose->header_list,
headerentry);
+
compose_create_header_entry(headerentry->compose);
- gtk_signal_disconnect_by_func
- (GTK_OBJECT(entry),
- GTK_SIGNAL_FUNC(compose_headerentry_changed_cb),
- headerentry);
+ g_signal_handlers_disconnect_matched
+ (G_OBJECT(entry), G_SIGNAL_MATCH_DATA,
+ 0, 0, NULL, NULL, headerentry);
+
/* Automatically scroll down */
compose_show_first_last_header(headerentry->compose, FALSE);
}
+ return FALSE;
}
static void compose_show_first_last_header(Compose *compose, gboolean show_first)
compose_send_control_enter(compose);
}
-static void text_inserted(GtkWidget *widget, const gchar *text,
- gint length, gint *position, Compose *compose)
+static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
+ const gchar *text, gint len, Compose *compose)
{
- GtkEditable *editable = GTK_EDITABLE(widget);
- gint paste_as_quotation = GPOINTER_TO_INT(gtk_object_get_data
- (GTK_OBJECT(widget), "paste_as_quotation"));
+ gint paste_as_quotation = GPOINTER_TO_INT(g_object_get_data
+ (G_OBJECT(compose->text), "paste_as_quotation"));
- gtk_signal_handler_block_by_func(GTK_OBJECT(widget),
- GTK_SIGNAL_FUNC(text_inserted),
- compose);
+ g_return_if_fail(text);
+
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
if (paste_as_quotation) {
gchar *new_text;
gchar *qmark;
- gint pos;
- new_text = g_strndup(text, length);
+ if (len < 0)
+ len = strlen(text);
+
+ new_text = g_strndup(text, len);
if (prefs_common.quotemark && *prefs_common.quotemark)
qmark = prefs_common.quotemark;
else
qmark = "> ";
- gtk_stext_set_point(GTK_STEXT(widget), *position);
+ gtk_text_buffer_place_cursor(buffer, iter);
compose_quote_fmt(compose, NULL, "%Q", qmark, new_text);
- pos = gtk_stext_get_point(GTK_STEXT(widget));
- gtk_editable_set_position(editable, pos);
- *position = pos;
g_free(new_text);
- gtk_object_set_data(GTK_OBJECT(widget), "paste_as_quotation",
- GINT_TO_POINTER(paste_as_quotation - 1));
+ g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
+ GINT_TO_POINTER(paste_as_quotation - 1));
} else
- gtk_editable_insert_text(editable, text, length, position);
+ gtk_text_buffer_insert(buffer, iter, text, len);
- if (prefs_common.autowrap)
+ if (compose->autowrap)
compose_wrap_line_all_full(compose, TRUE);
- gtk_signal_handler_unblock_by_func(GTK_OBJECT(widget),
- GTK_SIGNAL_FUNC(text_inserted),
- compose);
- gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+ g_signal_stop_emission_by_name(G_OBJECT(buffer), "insert-text");
if (prefs_common.autosave &&
- gtk_stext_get_length(GTK_STEXT(widget)) % prefs_common.autosave_length == 0)
- gtk_timeout_add(500, (GtkFunction) compose_defer_auto_save_draft, compose);
+ gtk_text_buffer_get_char_count(buffer) % prefs_common.autosave_length == 0)
+ 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_cb((gpointer)compose, 2, NULL);
+ compose->draft_timeout_tag = -1;
+ compose_draft_cb((gpointer)compose, COMPOSE_AUTO_SAVE, NULL);
return FALSE;
}
GdkEvent *ev;
GdkEventKey *kev;
GtkItemFactory *ifactory;
- GtkAccelEntry *accel;
+ GtkAccelKey *accel;
GtkWidget *send_menu;
GSList *list;
GdkModifierType ignored_mods =
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_group_entries_from_object(GTK_OBJECT(send_menu));
+ list = gtk_accel_groups_from_object(G_OBJECT(send_menu));
if (!list)
return FALSE;
- accel = (GtkAccelEntry *)list->data;
- if (accel && accel->accelerator_key == kev->keyval &&
- (accel->accelerator_mods & ~ignored_mods) ==
+ 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;
}
#endif
+/*!
+ *\brief Guess originating forward account from MsgInfo and several
+ * "common preference" settings. Return NULL if no guess.
+ */
+static PrefsAccount *compose_guess_forward_account_from_msginfo(MsgInfo *msginfo)
+{
+ PrefsAccount *account = NULL;
+
+ g_return_val_if_fail(msginfo, NULL);
+ g_return_val_if_fail(msginfo->folder, NULL);
+ g_return_val_if_fail(msginfo->folder->prefs, NULL);
+
+ if (msginfo->folder->prefs->enable_default_account)
+ account = account_find_from_id(msginfo->folder->prefs->default_account);
+
+ if (!account)
+ account = msginfo->folder->folder->account;
+
+ if (!account && msginfo->to && prefs_common.forward_account_autosel) {
+ gchar *to;
+ Xstrdup_a(to, msginfo->to, return NULL);
+ extract_address(to);
+ account = account_find_from_address(to);
+ }
+
+ if (!account && prefs_common.forward_account_autosel) {
+ gchar cc[BUFFSIZE];
+ if (!procheader_get_header_from_msginfo
+ (msginfo, cc,sizeof cc , "CC:")) { /* Found a CC header */
+ extract_address(cc);
+ account = account_find_from_address(cc);
+ }
+ }
+
+ return account;
+}
+
+/**
+ * Add entry field for each address in list.
+ * \param compose E-Mail composition object.
+ * \param listAddress List of (formatted) E-Mail addresses.
+ */
+static void compose_add_field_list( Compose *compose, GList *listAddress ) {
+ GList *node;
+ gchar *addr;
+ node = listAddress;
+ while( node ) {
+ addr = ( gchar * ) node->data;
+ compose_entry_append( compose, addr, COMPOSE_TO );
+ node = g_list_next( node );
+ }
+}
+
+/*
+ * End of Source.
+ */
+
projects / claws.git / blobdiff