*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <sys/stat.h>
#include <unistd.h>
#include <time.h>
-/* #include <sys/utsname.h> */
#include <stdlib.h>
-#include <sys/wait.h>
+#if HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
#include <signal.h>
#include <errno.h>
#include <libgen.h>
# include <wctype.h>
#endif
+#include "sylpheed.h"
#include "main.h"
#include "mainwindow.h"
#include "compose.h"
#include "undo.h"
#include "foldersel.h"
#include "toolbar.h"
-
+#include "inc.h"
enum
{
COL_MIMETYPE = 0,
#define MAX_REFERENCES_LEN 999
-static GdkColor quote_color = {0, 0, 0, 0xbfff};
-
static GList *compose_list = NULL;
Compose *compose_generic_new (PrefsAccount *account,
static void compose_attach_parts (Compose *compose,
MsgInfo *msginfo);
-static void compose_wrap_paragraph (Compose *compose,
- GtkTextIter *par_iter);
+static void compose_beautify_paragraph (Compose *compose,
+ GtkTextIter *par_iter,
+ gboolean force);
static void compose_wrap_all (Compose *compose);
static void compose_wrap_all_full (Compose *compose,
gboolean autowrap);
GdkEventKey *event,
gboolean *cancelled);
-static void compose_exec_ext_editor (Compose *compose);
-static gint compose_exec_ext_editor_real (const gchar *file);
-static gboolean compose_ext_editor_kill (Compose *compose);
-static void compose_input_cb (gpointer data,
- gint source,
- GdkInputCondition condition);
-static void compose_set_ext_editor_sensitive (Compose *compose,
- gboolean sensitive);
+static void compose_exec_ext_editor (Compose *compose);
+#ifdef G_OS_UNIX
+static gint compose_exec_ext_editor_real (const gchar *file);
+static gboolean compose_ext_editor_kill (Compose *compose);
+static gboolean compose_input_cb (GIOChannel *source,
+ GIOCondition condition,
+ gpointer data);
+static void compose_set_ext_editor_sensitive (Compose *compose,
+ gboolean sensitive);
+#endif /* G_OS_UNIX */
static void compose_undo_state_changed (UndoMain *undostruct,
gint undo_state,
static void compose_copy_cb (Compose *compose);
static void compose_paste_cb (Compose *compose);
static void compose_paste_as_quote_cb (Compose *compose);
+static void compose_paste_no_wrap_cb (Compose *compose);
+static void compose_paste_wrap_cb (Compose *compose);
static void compose_allsel_cb (Compose *compose);
static void compose_advanced_action_cb (Compose *compose,
guint action,
GtkWidget *widget);
-#if 0
-static void compose_toggle_to_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_toggle_cc_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_toggle_bcc_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_toggle_replyto_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_toggle_followupto_cb(gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_toggle_attach_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-#endif
static void compose_toggle_ruler_cb (gpointer data,
guint action,
GtkWidget *widget);
GtkWidget *widget);
static void compose_set_privacy_system_cb(GtkWidget *widget,
gpointer data);
-static void compose_update_privacy_system_menu_item(Compose * compose);
+static void compose_update_privacy_system_menu_item(Compose * compose, gboolean warn);
static void activate_privacy_system (Compose *compose,
- PrefsAccount *account);
+ PrefsAccount *account,
+ gboolean warn);
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,
GdkDragContext *drag_context,
gint x, gint y,
guint time, gpointer user_data);
-#if 0
-static void to_activated (GtkWidget *widget,
- Compose *compose);
-static void newsgroups_activated (GtkWidget *widget,
- Compose *compose);
-static void cc_activated (GtkWidget *widget,
- Compose *compose);
-static void bcc_activated (GtkWidget *widget,
- Compose *compose);
-static void replyto_activated (GtkWidget *widget,
- Compose *compose);
-static void followupto_activated (GtkWidget *widget,
- Compose *compose);
-static void subject_activated (GtkWidget *widget,
- Compose *compose);
-#endif
static void text_inserted (GtkTextBuffer *buffer,
GtkTextIter *iter,
const gchar *text,
gint len,
Compose *compose);
-static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
+static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
gboolean to_all, gboolean to_ml,
gboolean to_sender,
gboolean followup_and_reply_to,
static gint compose_defer_auto_save_draft (Compose *compose);
static PrefsAccount *compose_guess_forward_account_from_msginfo (MsgInfo *msginfo);
-static void compose_close (Compose *compose);
+static gboolean compose_close (Compose *compose);
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_Edit/Cu_t"), "<control>X", compose_cut_cb, 0, NULL},
{N_("/_Edit/_Copy"), "<control>C", compose_copy_cb, 0, NULL},
{N_("/_Edit/_Paste"), "<control>V", compose_paste_cb, 0, NULL},
- {N_("/_Edit/Paste as _quotation"),
+ {N_("/_Edit/Special paste"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Edit/Special paste/as _quotation"),
NULL, compose_paste_as_quote_cb, 0, NULL},
+ {N_("/_Edit/Special paste/_wrapped"),
+ NULL, compose_paste_wrap_cb, 0, NULL},
+ {N_("/_Edit/Special paste/_unwrapped"),
+ NULL, compose_paste_no_wrap_cb, 0, NULL},
{N_("/_Edit/Select _all"), "<control>A", compose_allsel_cb, 0, NULL},
{N_("/_Edit/A_dvanced"), NULL, NULL, 0, "<Branch>"},
{N_("/_Edit/A_dvanced/Move a character backward"),
return FALSE;
}
+static GdkColor quote_color =
+ {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+
+static GdkColor signature_color = {
+ (gulong)0,
+ (gushort)0x7fff,
+ (gushort)0x7fff,
+ (gushort)0x7fff
+};
+
+static GdkColor uri_color = {
+ (gulong)0,
+ (gushort)0,
+ (gushort)0,
+ (gushort)0
+};
+
+static void compose_create_tags(GtkTextView *text, Compose *compose)
+{
+ GtkTextBuffer *buffer;
+ GdkColor black = {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+
+ buffer = gtk_text_view_get_buffer(text);
+
+ if (prefs_common.enable_color) {
+ /* grab the quote colors, converting from an int to a GdkColor */
+ gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_col,
+ "e_color);
+ gtkut_convert_int_to_gdk_color(prefs_common.signature_col,
+ &signature_color);
+ gtkut_convert_int_to_gdk_color(prefs_common.uri_col,
+ &uri_color);
+ } else {
+ signature_color = quote_color = uri_color = black;
+ }
+
+ gtk_text_buffer_create_tag(buffer, "quote",
+ "foreground-gdk", "e_color,
+ NULL);
+ gtk_text_buffer_create_tag(buffer, "signature",
+ "foreground-gdk", &signature_color,
+ NULL);
+ gtk_text_buffer_create_tag(buffer, "link",
+ "foreground-gdk", &uri_color,
+ NULL);
+ compose->no_wrap_tag = gtk_text_buffer_create_tag(buffer, "no_wrap", NULL);
+}
+
Compose *compose_new(PrefsAccount *account, const gchar *mailto,
GPtrArray *attach_files)
{
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
+ compose_create_tags(textview, compose);
undo_block(compose->undostruct);
#ifdef USE_ASPELL
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
+ compose_set_title(compose);
return compose;
}
{
gchar *privacy = NULL;
+ g_return_if_fail(compose != NULL);
+ g_return_if_fail(account != NULL);
+
if (override_pref == FALSE && account->default_encrypt_reply == FALSE)
return;
}
if (privacy != NULL) {
compose->privacy_system = g_strdup(privacy);
- compose_update_privacy_system_menu_item(compose);
+ compose_update_privacy_system_menu_item(compose, FALSE);
compose_use_encryption(compose, TRUE);
}
}
-void compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
+static void compose_force_signing(Compose *compose, PrefsAccount *account)
+{
+ gchar *privacy = NULL;
+
+ if (account->default_privacy_system
+ && strlen(account->default_privacy_system)) {
+ privacy = account->default_privacy_system;
+ } else {
+ GSList *privacy_avail = privacy_get_system_ids();
+ if (privacy_avail && g_slist_length(privacy_avail)) {
+ privacy = (gchar *)(privacy_avail->data);
+ }
+ }
+ if (privacy != NULL) {
+ compose->privacy_system = g_strdup(privacy);
+ compose_update_privacy_system_menu_item(compose, FALSE);
+ compose_use_signing(compose, TRUE);
+ }
+}
+
+Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
{
MsgInfo *msginfo;
guint list_len;
-
- g_return_if_fail(msginfo_list != NULL);
+ Compose *compose = NULL;
+ g_return_val_if_fail(msginfo_list != NULL, NULL);
msginfo = (MsgInfo*)g_slist_nth_data(msginfo_list, 0);
- g_return_if_fail(msginfo != NULL);
+ g_return_val_if_fail(msginfo != NULL, NULL);
list_len = g_slist_length(msginfo_list);
switch (mode) {
case COMPOSE_REPLY:
- compose_reply(msginfo, prefs_common.reply_with_quote,
+ compose = compose_reply(msginfo, prefs_common.reply_with_quote,
FALSE, prefs_common.default_reply_list, FALSE, body);
break;
case COMPOSE_REPLY_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, prefs_common.default_reply_list, FALSE, body);
+ compose = compose_reply(msginfo, TRUE,
+ FALSE, prefs_common.default_reply_list, FALSE, body);
break;
case COMPOSE_REPLY_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, prefs_common.default_reply_list, FALSE, NULL);
+ compose = compose_reply(msginfo, FALSE,
+ FALSE, prefs_common.default_reply_list, FALSE, NULL);
break;
case COMPOSE_REPLY_TO_SENDER:
- compose_reply(msginfo, prefs_common.reply_with_quote,
+ compose = compose_reply(msginfo, prefs_common.reply_with_quote,
FALSE, FALSE, TRUE, body);
break;
case COMPOSE_FOLLOWUP_AND_REPLY_TO:
- compose_followup_and_reply_to(msginfo,
+ compose = compose_followup_and_reply_to(msginfo,
prefs_common.reply_with_quote,
FALSE, FALSE, body);
break;
case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, FALSE, TRUE, body);
+ compose = compose_reply(msginfo, TRUE,
+ FALSE, FALSE, TRUE, body);
break;
case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, FALSE, TRUE, NULL);
+ compose = compose_reply(msginfo, FALSE,
+ FALSE, FALSE, TRUE, NULL);
break;
case COMPOSE_REPLY_TO_ALL:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- TRUE, FALSE, FALSE, body);
+ compose = compose_reply(msginfo, prefs_common.reply_with_quote,
+ TRUE, FALSE, FALSE, body);
break;
case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose_reply(msginfo, TRUE, TRUE, FALSE, FALSE, body);
+ compose = compose_reply(msginfo, TRUE,
+ TRUE, FALSE, FALSE, body);
break;
case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, TRUE, FALSE, FALSE, NULL);
+ compose = compose_reply(msginfo, FALSE,
+ TRUE, FALSE, FALSE, NULL);
break;
case COMPOSE_REPLY_TO_LIST:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, TRUE, FALSE, body);
+ compose = compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, TRUE, FALSE, body);
break;
case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, body);
+ compose = compose_reply(msginfo, TRUE,
+ FALSE, TRUE, FALSE, body);
break;
case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
+ compose = compose_reply(msginfo, FALSE,
+ FALSE, TRUE, FALSE, NULL);
break;
case COMPOSE_FORWARD:
if (prefs_common.forward_as_attachment) {
- compose_reply_mode(COMPOSE_FORWARD_AS_ATTACH, msginfo_list, body);
- return;
+ compose = compose_reply_mode(COMPOSE_FORWARD_AS_ATTACH, msginfo_list, body);
+ return compose;
} else {
- compose_reply_mode(COMPOSE_FORWARD_INLINE, msginfo_list, body);
- return;
+ compose = compose_reply_mode(COMPOSE_FORWARD_INLINE, msginfo_list, body);
+ return compose;
}
break;
case COMPOSE_FORWARD_INLINE:
/* check if we reply to more than one Message */
if (list_len == 1) {
- compose_forward(NULL, msginfo, FALSE, body, FALSE);
+ compose = compose_forward(NULL, msginfo, FALSE, body, FALSE);
break;
}
/* more messages FALL THROUGH */
case COMPOSE_FORWARD_AS_ATTACH:
- compose_forward_multiple(NULL, msginfo_list);
+ compose = compose_forward_multiple(NULL, msginfo_list);
break;
case COMPOSE_REDIRECT:
- compose_redirect(NULL, msginfo);
+ compose = compose_redirect(NULL, msginfo);
break;
default:
g_warning("compose_reply(): invalid Compose Mode: %d\n", mode);
}
+ return compose;
}
-void compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
+Compose *compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
gboolean to_ml, gboolean to_sender,
const gchar *body)
{
- compose_generic_reply(msginfo, quote, to_all, to_ml,
+ return compose_generic_reply(msginfo, quote, to_all, to_ml,
to_sender, FALSE, body);
}
-void compose_followup_and_reply_to(MsgInfo *msginfo, gboolean quote,
+Compose *compose_followup_and_reply_to(MsgInfo *msginfo, gboolean quote,
gboolean to_all,
gboolean to_sender,
const gchar *body)
{
- compose_generic_reply(msginfo, quote, to_all, FALSE,
+ return compose_generic_reply(msginfo, quote, to_all, FALSE,
to_sender, TRUE, body);
}
-static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
+static void compose_extract_original_charset(Compose *compose)
+{
+ MsgInfo *info = NULL;
+ if (compose->replyinfo) {
+ info = compose->replyinfo;
+ } else if (compose->fwdinfo) {
+ info = compose->fwdinfo;
+ } else if (compose->targetinfo) {
+ info = compose->targetinfo;
+ }
+ if (info) {
+ MimeInfo *mimeinfo = procmime_scan_message(info);
+ MimeInfo *partinfo = mimeinfo;
+ while (partinfo && partinfo->type != MIMETYPE_TEXT)
+ partinfo = procmime_mimeinfo_next(partinfo);
+ if (partinfo) {
+ compose->orig_charset =
+ g_strdup(procmime_mimeinfo_get_parameter(
+ partinfo, "charset"));
+ }
+ procmime_mimeinfo_free_all(mimeinfo);
+ }
+}
+
+static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
gboolean to_all, gboolean to_ml,
gboolean to_sender,
gboolean followup_and_reply_to,
GtkTextIter iter;
int cursor_pos;
- g_return_if_fail(msginfo != NULL);
- g_return_if_fail(msginfo->folder != NULL);
+ g_return_val_if_fail(msginfo != NULL, NULL);
+ g_return_val_if_fail(msginfo->folder != NULL, NULL);
account = account_get_reply_account(msginfo, prefs_common.reply_account_autosel);
- g_return_if_fail(account != NULL);
+ g_return_val_if_fail(account != NULL, NULL);
if (to_sender && account->protocol == A_NNTP &&
!followup_and_reply_to) {
if (!reply_account)
reply_account = compose_current_mail_account();
if (!reply_account)
- return;
+ return NULL;
} else
reply_account = account;
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);
-
+
+ compose_extract_original_charset(compose);
+
if (msginfo->folder && msginfo->folder->ret_rcpt)
menu_set_active(ifactory, "/Options/Request Return Receipt", TRUE);
g_free(folderidentifier);
}
- if (compose_parse_header(compose, msginfo) < 0) return;
+ if (compose_parse_header(compose, msginfo) < 0) return NULL;
compose_reply_set_entry(compose, msginfo, to_all, to_ml,
to_sender, followup_and_reply_to);
compose_show_first_last_header(compose, TRUE);
textview = (GTK_TEXT_VIEW(compose->text));
textbuf = gtk_text_view_get_buffer(textview);
-
+ compose_create_tags(textview, compose);
+
undo_block(compose->undostruct);
#ifdef USE_ASPELL
if (msginfo->folder && msginfo->folder->prefs &&
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_all(compose);
+ compose_wrap_all(compose);
gtk_widget_grab_focus(compose->text);
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
+
+ compose_set_title(compose);
+ return compose;
}
#define INSERT_FW_HEADER(var, hdr) \
if (!compose->fwdinfo)
compose->fwdinfo = procmsg_msginfo_copy(msginfo);
+ compose_extract_original_charset(compose);
+
if (msginfo->subject && *msginfo->subject) {
gchar *buf, *buf2, *p;
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
+ compose_create_tags(textview, compose);
if (as_attach) {
gchar *msgfile;
if (account->auto_sig)
compose_insert_sig(compose, FALSE);
- if (prefs_common.linewrap_quote)
- compose_wrap_all(compose);
+ compose_wrap_all(compose);
gtk_text_buffer_get_start_iter(textbuf, &iter);
gtk_text_buffer_place_cursor(textbuf, &iter);
-#if 0 /* NEW COMPOSE GUI */
- if (account->protocol != A_NNTP)
- gtk_widget_grab_focus(compose->to_entry);
- else
- gtk_widget_grab_focus(compose->newsgroups_entry);
-#endif
gtk_widget_grab_focus(compose->header_last->entry);
if (!no_extedit && prefs_common.auto_exteditor)
g_free(folderidentifier);
}
+ compose_set_title(compose);
return compose;
}
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
+ compose_create_tags(textview, compose);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
if (account->auto_sig)
compose_insert_sig(compose, FALSE);
- if (prefs_common.linewrap_quote)
- compose_wrap_all(compose);
+ compose_wrap_all(compose);
gtk_text_buffer_get_start_iter(textbuf, &iter);
gtk_text_buffer_place_cursor(textbuf, &iter);
gtk_widget_grab_focus(compose->header_last->entry);
-#if 0 /* NEW COMPOSE GUI */
- if (account->protocol != A_NNTP)
- gtk_widget_grab_focus(compose->to_entry);
- else
- gtk_widget_grab_focus(compose->newsgroups_entry);
-#endif
-
+ compose_set_title(compose);
return compose;
}
+static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbuf, GtkTextIter *iter)
+{
+ GtkTextIter start = *iter;
+ GtkTextIter end_iter;
+ int start_pos = gtk_text_iter_get_offset(&start);
+
+ if (!compose->account->sig_sep)
+ return FALSE;
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+ start_pos+strlen(compose->account->sig_sep));
+
+ /* check sig separator */
+ if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),
+ compose->account->sig_sep)) {
+ /* check end of line (\n) */
+ gtk_text_buffer_get_iter_at_offset(textbuf, &start,
+ start_pos+strlen(compose->account->sig_sep));
+ 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(&start, &end_iter),"\n"));
+ return TRUE;
+
+
+ }
+
+ return FALSE;
+}
+
+static void compose_colorize_signature(Compose *compose)
+{
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
+ GtkTextIter iter;
+ GtkTextIter end_iter;
+ gtk_text_buffer_get_start_iter(buffer, &iter);
+ while (gtk_text_iter_forward_line(&iter))
+ if (compose_is_sig_separator(compose, buffer, &iter)) {
+ gtk_text_buffer_get_end_iter(buffer, &end_iter);
+ gtk_text_buffer_apply_tag_by_name(buffer,"signature",&iter, &end_iter);
+ }
+}
+
void compose_reedit(MsgInfo *msginfo)
{
Compose *compose = NULL;
if (compose_put_existing_to_front(msginfo))
return;
- if (msginfo->folder->stype == F_QUEUE || msginfo->folder->stype == F_DRAFT) {
+ if (folder_has_parent_of_type(msginfo->folder, F_QUEUE) ||
+ folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
gchar queueheader_buf[BUFFSIZE];
gint id, param;
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);
+ if (privacy_system != NULL) {
+ compose->privacy_system = privacy_system;
+ compose_use_signing(compose, use_signing);
+ compose_use_encryption(compose, use_encryption);
+ compose_update_privacy_system_menu_item(compose, FALSE);
+ } else {
+ activate_privacy_system(compose, account, FALSE);
+ }
compose->targetinfo = procmsg_msginfo_copy(msginfo);
- if (msginfo->folder->stype == F_QUEUE
- || msginfo->folder->stype == F_DRAFT) {
+ compose_extract_original_charset(compose);
+
+ if (folder_has_parent_of_type(msginfo->folder, F_QUEUE) ||
+ folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
gchar queueheader_buf[BUFFSIZE];
/* Set message save folder */
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
+ compose_create_tags(textview, compose);
+
mark = gtk_text_buffer_get_insert(textbuf);
gtk_text_buffer_get_iter_at_mark(textbuf, &iter, mark);
strcrchomp(buf);
gtk_text_buffer_insert(textbuf, &iter, buf, -1);
}
+ compose_wrap_all_full(compose, FALSE);
compose->autowrap = prev_autowrap;
fclose(fp);
}
compose_attach_parts(compose, msginfo);
+ compose_colorize_signature(compose);
+
g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
G_CALLBACK(compose_changed_cb),
compose);
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
+ compose_set_title(compose);
}
Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
compose = compose_create(account, COMPOSE_REDIRECT);
ifactory = gtk_item_factory_from_widget(compose->menubar);
-
+ compose_create_tags(GTK_TEXT_VIEW(compose->text), compose);
compose->replyinfo = NULL;
compose->fwdinfo = NULL;
compose_quote_fmt(compose, msginfo, "%M", NULL, NULL);
gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
+ compose_colorize_signature(compose);
+
ifactory = gtk_item_factory_from_widget(compose->popupmenu);
menu_set_sensitive(ifactory, "/Add...", FALSE);
menu_set_sensitive(ifactory, "/Remove", FALSE);
gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
+ compose_set_title(compose);
return compose;
}
!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;
- }
+ pango_font_description_set_weight
+ (bold_style->font_desc, PANGO_WEIGHT_BOLD);
bold_style->fg[GTK_STATE_NORMAL] = bold_color;
}
gtk_widget_set_style(GTK_WIDGET(entry), bold_style);
compose_ext_editor_cb(compose, 0, NULL);
break;
case A_LINEWRAP_CURRENT:
- compose_wrap_paragraph(compose, NULL);
+ compose_beautify_paragraph(compose, NULL, TRUE);
break;
case A_LINEWRAP_ALL:
- compose_wrap_all(compose);
+ compose_wrap_all_full(compose, TRUE);
break;
case A_ADDRBOOK:
compose_address_cb(compose, 0, NULL);
gint len;
gboolean prev_autowrap;
const gchar *trimmed_body = body;
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
if (!msginfo)
msginfo = &dummyinfo;
prev_autowrap = compose->autowrap;
compose->autowrap = FALSE;
+ 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);
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_text_buffer_insert(buffer, &iter, p, len);
+ if (g_utf8_validate(p, -1, NULL)) {
+ gtk_text_buffer_insert(buffer, &iter, p, len);
+ } else {
+ gchar *tmpin = g_strdup(p);
+ gchar *tmpout = NULL;
+ tmpin[len] = '\0';
+ tmpout = conv_codeset_strdup
+ (tmpin, conv_get_locale_charset_str(),
+ CS_INTERNAL);
+ gtk_text_buffer_insert(buffer, &iter, tmpout, -1);
+ g_free(tmpin);
+ g_free(tmpout);
+ }
- 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
if (compose->autowrap)
compose_wrap_all(compose);
+ 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);
+
+
return buf;
}
g_return_if_fail(msginfo != NULL);
if (compose->account->protocol != A_NNTP) {
- if (!compose->replyto && to_ml && compose->ml_post
- && !(msginfo->folder && msginfo->folder->prefs->enable_default_reply_to))
+ if (to_ml && compose->ml_post
+ && !(msginfo->folder &&
+ msginfo->folder->prefs->enable_default_reply_to)) {
compose_entry_append(compose,
compose->ml_post,
COMPOSE_TO);
+ if (compose->replyto) {
+ gchar *tmp1 = NULL, *tmp2 = NULL;
+ Xstrdup_a(tmp1, compose->replyto, return);
+ if (compose->ml_post)
+ Xstrdup_a(tmp2, compose->ml_post, return);
+ extract_address(tmp1);
+ extract_address(tmp2);
+ if (tmp1 && tmp2 && strcmp(tmp1, tmp2))
+ compose_entry_append(compose,
+ compose->replyto,
+ COMPOSE_CC);
+ }
+ }
else if (!(to_all || to_sender)
&& msginfo->folder
&& msginfo->folder->prefs->enable_default_reply_to) {
SET_ADDRESS(COMPOSE_FOLLOWUPTO, compose->followup_to);
compose_update_priority_menu_item(compose);
- compose_update_privacy_system_menu_item(compose);
+ compose_update_privacy_system_menu_item(compose, FALSE);
compose_show_first_last_header(compose, TRUE);
}
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
GtkTextMark *mark;
- GtkTextIter iter;
+ GtkTextIter iter, iter_end;
gint cur_pos;
gboolean prev_autowrap;
if (!compose->sig_str || (replace && !compose->account->auto_sig))
compose->sig_str = g_strdup("");
+ cur_pos = gtk_text_iter_get_offset(&iter);
gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
+ /* skip \n\n */
+ gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
+ gtk_text_iter_forward_char(&iter);
+ gtk_text_iter_forward_char(&iter);
+ gtk_text_buffer_get_end_iter(buffer, &iter_end);
+ gtk_text_buffer_apply_tag_by_name(buffer,"signature",&iter, &iter_end);
if (cur_pos > gtk_text_buffer_get_char_count (buffer))
cur_pos = gtk_text_buffer_get_char_count (buffer);
sig_str = g_strconcat("\n\n", sig_body, NULL);
if (sig_str) {
- if (!g_utf8_validate(sig_str,1, NULL)) {
+ if (g_utf8_validate(sig_str, -1, NULL) == TRUE)
+ utf8_sig_str = sig_str;
+ else {
utf8_sig_str = conv_codeset_strdup
- (sig_str, conv_get_locale_charset_str(), CS_INTERNAL);
+ (sig_str, conv_get_locale_charset_str(),
+ CS_INTERNAL);
g_free(sig_str);
- } else
- utf8_sig_str = sig_str;
+ }
}
return utf8_sig_str;
g_return_val_if_fail(file != NULL, COMPOSE_INSERT_NO_FILE);
- if ((fp = fopen(file, "rb")) == NULL) {
+ if ((fp = g_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return COMPOSE_INSERT_READ_ERROR;
}
while (fgets(buf, sizeof(buf), fp) != NULL) {
gchar *str;
- str = conv_codeset_strdup(buf, cur_encoding, CS_INTERNAL);
+ if (g_utf8_validate(buf, -1, NULL) == TRUE)
+ str = g_strdup(buf);
+ else
+ str = conv_codeset_strdup
+ (buf, cur_encoding, CS_INTERNAL);
if (!str) continue;
/* strip <CR> if DOS/Windows file,
alertpanel_notice(_("File %s is empty."), filename);
return;
}
- if ((fp = fopen(file, "rb")) == NULL) {
+ if ((fp = g_fopen(file, "rb")) == NULL) {
alertpanel_error(_("Can't read %s."), filename);
return;
}
fclose(fp);
-#if 0 /* NEW COMPOSE GUI */
- if (!compose->use_attach) {
- GtkItemFactory *ifactory;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_active(ifactory, "/View/Attachment", TRUE);
- }
-#endif
ainfo = g_new0(AttachInfo, 1);
auto_ainfo = g_auto_pointer_new_with_free
(ainfo, (GFreeFunc) compose_attach_info_free);
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);
+
+ /* if we meet a pgp signature, we don't attach it, but
+ * we force signing. */
+ if (strcmp(content_type, "application/pgp-signature")) {
+ partname = procmime_mimeinfo_get_parameter(child, "filename");
+ if (partname == NULL)
+ partname = procmime_mimeinfo_get_parameter(child, "name");
+ if (partname == NULL)
+ partname = "";
+ compose_attach_append(compose, outfile,
+ partname, content_type);
+ } else {
+ compose_force_signing(compose, compose->account);
+ }
g_free(content_type);
}
g_free(outfile);
gboolean can_break = FALSE;
gboolean do_break = FALSE;
gboolean was_white = FALSE;
+ gboolean prev_dont_break = FALSE;
gtk_text_iter_forward_to_line_end(&line_end);
str = gtk_text_buffer_get_text(buffer, &iter, &line_end, FALSE);
gunichar wc;
gint uri_len;
- if (attr->is_line_break && can_break && was_white)
+ if (attr->is_line_break && can_break && was_white && !prev_dont_break)
pos = i;
was_white = attr->is_white;
}
wc = g_utf8_get_char(p);
- if (g_unichar_iswide(wc))
+ if (g_unichar_iswide(wc)) {
col += 2;
- else if (*p == '\t')
+ if (prev_dont_break && can_break && attr->is_line_break)
+ pos = i;
+ } else if (*p == '\t')
col += 8;
else
col++;
break;
}
+ if (*p == '-' || *p == '/')
+ prev_dont_break = TRUE;
+ else
+ prev_dont_break = FALSE;
+
p = g_utf8_next_char(p);
can_break = TRUE;
}
return do_break;
}
-static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbuf, GtkTextIter *iter)
-{
- GtkTextIter start = *iter;
- GtkTextIter end_iter;
- int start_pos = gtk_text_iter_get_offset(&start);
-
- if (!compose->account->sig_sep)
- return FALSE;
-
- gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
- start_pos+strlen(compose->account->sig_sep));
-
- /* check sig separator */
- if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),
- compose->account->sig_sep)) {
- /* check end of line (\n) */
- gtk_text_buffer_get_iter_at_offset(textbuf, &start,
- start_pos+strlen(compose->account->sig_sep));
- 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(&start, &end_iter),"\n"));
- return TRUE;
-
-
- }
-
- return FALSE;
-}
-
static gboolean compose_join_next_line(Compose *compose,
GtkTextBuffer *buffer,
GtkTextIter *iter,
return TRUE;
}
-static void compose_wrap_paragraph(Compose *compose, GtkTextIter *par_iter)
+#define ADD_TXT_POS(bp_, ep_, pti_) \
+ if ((last->next = alloca(sizeof(struct txtpos))) != NULL) { \
+ last = last->next; \
+ last->bp = (bp_); last->ep = (ep_); last->pti = (pti_); \
+ last->next = NULL; \
+ } else { \
+ g_warning("alloc error scanning URIs\n"); \
+ }
+
+static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter, gboolean force)
{
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer;
- GtkTextIter iter, break_pos;
+ GtkTextIter iter, break_pos, end_of_line;
gchar *quote_str = NULL;
gint quote_len;
gboolean wrap_quote = prefs_common.linewrap_quote;
gboolean prev_autowrap = compose->autowrap;
+ gint startq_offset = -1, noq_offset = -1;
+ gint uri_start = -1, uri_stop = -1;
+ gint nouri_start = -1, nouri_stop = -1;
compose->autowrap = FALSE;
/* go until paragraph end (empty line) */
while (!gtk_text_iter_ends_line(&iter)) {
+ gchar *scanpos = NULL;
+ /* parse table - in order of priority */
+ struct table {
+ const gchar *needle; /* token */
+
+ /* token search function */
+ gchar *(*search) (const gchar *haystack,
+ const gchar *needle);
+ /* part parsing function */
+ gboolean (*parse) (const gchar *start,
+ const gchar *scanpos,
+ const gchar **bp_,
+ const gchar **ep_);
+ /* part to URI function */
+ gchar *(*build_uri) (const gchar *bp,
+ const gchar *ep);
+ };
+
+ static struct table parser[] = {
+ {"http://", strcasestr, get_uri_part, make_uri_string},
+ {"https://", strcasestr, get_uri_part, make_uri_string},
+ {"ftp://", strcasestr, get_uri_part, make_uri_string},
+ {"www.", strcasestr, get_uri_part, make_http_string},
+ {"mailto:", strcasestr, get_uri_part, make_uri_string},
+ {"@", strcasestr, get_email_part, make_email_string}
+ };
+ const gint PARSE_ELEMS = sizeof parser / sizeof parser[0];
+ gint last_index = PARSE_ELEMS;
+ gint n;
+ gchar *o_walk = NULL, *walk = NULL, *bp = NULL, *ep = NULL;
+ gint walk_pos;
+
+ if (gtk_text_iter_has_tag(&iter, compose->no_wrap_tag) && !force)
+ goto colorize;
+
+ uri_start = uri_stop = -1;
quote_str = compose_get_quote_str(buffer, &iter, "e_len);
+
if (quote_str) {
if (!wrap_quote) {
- gtk_text_iter_forward_line(&iter);
- g_free(quote_str);
- continue;
+ if (startq_offset == -1) {
+ startq_offset = gtk_text_iter_get_offset(&iter);
+ }
+ goto colorize;
}
- debug_print("compose_wrap_paragraph(): quote_str = '%s'\n", quote_str);
+ debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);
+ if (startq_offset == -1)
+ startq_offset = gtk_text_iter_get_offset(&iter);
+ } else {
+ if (startq_offset == -1)
+ noq_offset = gtk_text_iter_get_offset(&iter);
}
+ if (prev_autowrap == FALSE && !force && !wrap_quote) {
+ goto colorize;
+ }
if (compose_get_line_break_pos(buffer, &iter, &break_pos,
prefs_common.linewrap_len,
quote_len)) {
GtkTextIter prev, next, cur;
-
- gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
-
+
+ if (prev_autowrap != FALSE || force)
+ gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
+ else if (quote_str && wrap_quote)
+ gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
+ else
+ goto colorize;
/* remove trailing spaces */
cur = break_pos;
gtk_text_iter_backward_char(&cur);
/* move iter to current line start */
gtk_text_iter_set_line_offset(&iter, 0);
+ continue;
} else {
/* move iter to next line start */
iter = break_pos;
- gtk_text_iter_forward_line(&iter);
}
+colorize:
+ end_of_line = iter;
+ while (!gtk_text_iter_ends_line(&end_of_line)) {
+ gtk_text_iter_forward_char(&end_of_line);
+ }
+ o_walk = walk = gtk_text_buffer_get_text(buffer, &iter, &end_of_line, FALSE);
+
+ nouri_start = gtk_text_iter_get_offset(&iter);
+ nouri_stop = gtk_text_iter_get_offset(&end_of_line);
+
+ walk_pos = gtk_text_iter_get_offset(&iter);
+ /* FIXME: this looks phony. scanning for anything in the parse table */
+ for (n = 0; n < PARSE_ELEMS; n++) {
+ gchar *tmp;
+
+ tmp = parser[n].search(walk, parser[n].needle);
+ if (tmp) {
+ if (scanpos == NULL || tmp < scanpos) {
+ scanpos = tmp;
+ last_index = n;
+ }
+ }
+ }
+
+ bp = ep = 0;
+ if (scanpos) {
+ /* check if URI can be parsed */
+ if (parser[last_index].parse(walk, scanpos, (const gchar **)&bp,(const gchar **)&ep)
+ && (size_t) (ep - bp - 1) > strlen(parser[last_index].needle)) {
+ walk = ep;
+ } else
+ walk = scanpos +
+ strlen(parser[last_index].needle);
+ }
+ if (bp && ep) {
+ uri_start = walk_pos + (bp - o_walk);
+ uri_stop = walk_pos + (ep - o_walk);
+ }
+ g_free(o_walk);
+ o_walk = NULL;
+ gtk_text_iter_forward_line(&iter);
g_free(quote_str);
+ quote_str = NULL;
+ if (startq_offset != -1) {
+ GtkTextIter startquote, endquote;
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &startquote, startq_offset);
+ endquote = iter;
+ gtk_text_buffer_apply_tag_by_name(
+ buffer, "quote", &startquote, &endquote);
+ startq_offset = -1;
+ } else if (noq_offset != -1) {
+ GtkTextIter startnoquote, endnoquote;
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &startnoquote, noq_offset);
+ endnoquote = iter;
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote", &startnoquote, &endnoquote);
+ noq_offset = -1;
+ }
+
+ /* always */ {
+ GtkTextIter nouri_start_iter, nouri_end_iter;
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &nouri_start_iter, nouri_start);
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &nouri_end_iter, nouri_stop);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "link", &nouri_start_iter, &nouri_end_iter);
+ }
+ if (uri_start > 0 && uri_stop > 0) {
+ GtkTextIter uri_start_iter, uri_end_iter;
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &uri_start_iter, uri_start);
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &uri_end_iter, uri_stop);
+ gtk_text_buffer_apply_tag_by_name(
+ buffer, "link", &uri_start_iter, &uri_end_iter);
+ }
}
if (par_iter)
compose_wrap_all_full(compose, FALSE);
}
-static void compose_wrap_all_full(Compose *compose, gboolean autowrap)
+static void compose_wrap_all_full(Compose *compose, gboolean force)
{
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer;
gtk_text_buffer_get_start_iter(buffer, &iter);
while (!gtk_text_iter_is_end(&iter))
- compose_wrap_paragraph(compose, &iter);
+ compose_beautify_paragraph(compose, &iter, force);
undo_unblock(compose->undostruct);
}
{
gchar *str;
gchar *edited;
-
+ gchar *subject;
+
edited = compose->modified ? _(" [Edited]") : "";
- if (compose->account && compose->account->address)
+
+ subject = gtk_editable_get_chars(
+ GTK_EDITABLE(compose->subject_entry), 0, -1);
+
+ if (subject && strlen(subject))
+ str = g_strdup_printf(_("%s - Compose message%s"),
+ subject, edited);
+ else if (compose->account && compose->account->address)
str = g_strdup_printf(_("%s - Compose message%s"),
compose->account->address, edited);
else
str = g_strdup_printf(_("Compose message%s"), edited);
gtk_window_set_title(GTK_WINDOW(compose->window), str);
g_free(str);
+ g_free(subject);
}
/**
compose_set_title(compose);
ifactory = gtk_item_factory_from_widget(compose->menubar);
-#if 0
- if (account->protocol == A_NNTP) {
- gtk_widget_show(compose->newsgroups_hbox);
- gtk_widget_show(compose->newsgroups_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 4);
- compose->use_newsgroups = 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_hide(compose->newsgroups_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_newsgroups = 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_show(compose, COMPOSE_ENTRY_CC);
- if (account->auto_cc && compose->mode != COMPOSE_REEDIT)
- compose_entry_set(compose, account->auto_cc,
- COMPOSE_ENTRY_CC);
- }
- if (account->set_autobcc) {
- compose_entry_show(compose, COMPOSE_ENTRY_BCC);
- if (account->auto_bcc && compose->mode != COMPOSE_REEDIT)
- compose_entry_set(compose, account->auto_bcc,
- COMPOSE_ENTRY_BCC);
- }
- if (account->set_autoreplyto) {
- compose_entry_show(compose, COMPOSE_ENTRY_REPLY_TO);
- if (account->auto_replyto && compose->mode != COMPOSE_REEDIT)
- compose_entry_set(compose, account->auto_replyto,
- COMPOSE_ENTRY_REPLY_TO);
- }
-
-#endif
if (account->default_sign && compose->mode != COMPOSE_REDIRECT)
menu_set_active(ifactory, "/Options/Sign", TRUE);
else
menu_set_active(ifactory, "/Options/Encrypt", FALSE);
- activate_privacy_system(compose, account);
+ activate_privacy_system(compose, account, FALSE);
if (!init && compose->mode != COMPOSE_REDIRECT)
compose_insert_sig(compose, TRUE);
val = compose_queue(compose, &msgnum, &folder);
if (val) {
- if (val == -2) {
+ if (val == -4) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Charset conversion failed."));
+ } else if (val == -3) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Signature failed."));
+ } else if (val == -2) {
alertpanel_error(_("Could not queue message for sending:\n\n%s."), strerror(errno));
} else {
alertpanel_error(_("Could not queue message for sending."));
size_t len;
gchar buf[BUFFSIZE];
- if ((fp = fopen(compose->redirect_filename, "rb")) == NULL) {
+ if ((fp = g_fopen(compose->redirect_filename, "rb")) == NULL) {
FILE_OP_ERROR(compose->redirect_filename, "fopen");
return -1;
}
out_codeset = CS_US_ASCII;
encoding = ENC_7BIT;
} else {
- const gchar *src_codeset;
+ const gchar *src_codeset = CS_INTERNAL;
out_codeset = conv_get_charset_str(compose->out_encoding);
- if (!out_codeset)
+
+ if (!out_codeset) {
+ gchar *test_conv_global_out = NULL;
+ gchar *test_conv_reply = NULL;
+
+ /* automatic mode. be automatic. */
+ codeconv_set_strict(TRUE);
+
out_codeset = conv_get_outgoing_charset_str();
+ if (out_codeset) {
+ debug_print("trying to convert to %s\n", out_codeset);
+ test_conv_global_out = conv_codeset_strdup(chars, src_codeset, out_codeset);
+ }
+
+ if (!test_conv_global_out && compose->orig_charset) {
+ out_codeset = compose->orig_charset;
+ debug_print("failure; trying to convert to %s\n", out_codeset);
+ test_conv_reply = conv_codeset_strdup(chars, src_codeset, out_codeset);
+ }
+
+ if (!test_conv_global_out && !test_conv_reply) {
+ /* we're lost */
+ out_codeset = CS_INTERNAL;
+ debug_print("finally using %s\n", out_codeset);
+ }
+ g_free(test_conv_global_out);
+ g_free(test_conv_reply);
+ codeconv_set_strict(FALSE);
+ }
if (!g_ascii_strcasecmp(out_codeset, CS_US_ASCII))
out_codeset = CS_ISO_8859_1;
else
encoding = procmime_get_encoding_for_charset(out_codeset);
- src_codeset = CS_INTERNAL;
- /* if current encoding is US-ASCII, set it the same as
- outgoing one to prevent code conversion failure */
- if (!g_ascii_strcasecmp(src_codeset, CS_US_ASCII))
- 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));
if (action == COMPOSE_WRITE_FOR_SEND) {
+ codeconv_set_strict(TRUE);
buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
-
+ codeconv_set_strict(FALSE);
+
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);
+ msg = g_strdup_printf(_("Can't convert the character encoding of the message \n"
+ "to the specified %s charset.\n"
+ "Send it as %s?"), out_codeset, src_codeset);
+ aval = alertpanel_full(_("Error"), msg, GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
+ NULL, ALERT_ERROR, G_ALERTALTERNATE);
g_free(msg);
if (aval != G_ALERTDEFAULT) {
g_free(chars);
- return -1;
+ return -3;
} else {
buf = chars;
out_codeset = src_codeset;
/* protect trailing spaces when signing message */
if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
privacy_system_can_sign(compose->privacy_system)) {
- if (encoding == ENC_7BIT)
- encoding = ENC_QUOTED_PRINTABLE;
- else if (encoding == ENC_8BIT)
- encoding = ENC_BASE64;
+ encoding = ENC_QUOTED_PRINTABLE;
}
/* check for line length limit */
- if (encoding != ENC_QUOTED_PRINTABLE && encoding != ENC_BASE64 &&
+ if (action == COMPOSE_WRITE_FOR_SEND &&
+ encoding != ENC_QUOTED_PRINTABLE && encoding != ENC_BASE64 &&
check_line_length(buf, 1000, &line) < 0) {
AlertValue aval;
gchar *msg;
"\n"
"Send it anyway?"), line + 1);
aval = alertpanel(_("Warning"), msg, GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
+ g_free(msg);
if (aval != G_ALERTDEFAULT) {
- g_free(msg);
- fclose(fp);
- g_free(buf);
return -1;
}
}
if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
privacy_system_can_sign(compose->privacy_system))
if (!privacy_sign(compose->privacy_system, mimemsg, compose->account))
- return -1;
+ return -2;
procmime_write_mimeinfo(mimemsg, fp);
size_t len;
gchar *chars, *tmp;
- if ((fp = fopen(file, "wb")) == NULL) {
+ if ((fp = g_fopen(file, "wb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return -1;
}
FILE_OP_ERROR(file, "fwrite");
g_free(chars);
fclose(fp);
- unlink(file);
+ g_unlink(file);
return -1;
}
if (fclose(fp) == EOF) {
FILE_OP_ERROR(file, "fclose");
- unlink(file);
+ g_unlink(file);
return -1;
}
return 0;
g_return_val_if_fail(item != NULL, -1);
if (procmsg_msg_exist(msginfo) &&
- (item->stype == F_DRAFT || item->stype == F_QUEUE
+ (folder_has_parent_of_type(item, F_QUEUE) ||
+ folder_has_parent_of_type(item, F_DRAFT)
|| msginfo == compose->autosaved_draft)) {
if (folder_item_remove_msg(item, msginfo->msgnum) < 0) {
g_warning("can't remove the old message\n");
/* write queue header */
tmp = g_strdup_printf("%s%cqueue.%p", get_tmp_dir(),
G_DIR_SEPARATOR, compose);
- if ((fp = fopen(tmp, "wb")) == NULL) {
+ if ((fp = g_fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
g_free(tmp);
return -2;
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);
- if (encdata != NULL)
- fprintf(fp, "X-Sylpheed-Encrypt-Data:%s\n",
- encdata);
+ if (encdata != NULL) {
+ if (strcmp(encdata, "_DONT_ENCRYPT_")) {
+ fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
+ fprintf(fp, "X-Sylpheed-Encrypt-Data:%s\n",
+ encdata);
+ } /* else we finally dont want to encrypt */
+ } else {
+ fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);
+ /* and if encdata was null, it means there's been a problem in
+ * key selection */
+ }
g_free(encdata);
}
}
if (compose_redirect_write_to_file(compose, fp) < 0) {
lock = FALSE;
fclose(fp);
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
return -2;
}
} else {
- if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND) < 0) {
+ gint result = 0;
+ if ((result = compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND)) < 0) {
lock = FALSE;
fclose(fp);
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
- return -2;
+ return result - 1; /* -2 for a generic error, -3 for signing error, -4 for encoding */
}
}
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
return -2;
}
queue = account_get_special_folder(compose->account, F_QUEUE);
if (!queue) {
g_warning("can't find queue folder\n");
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
return -1;
}
folder_item_scan(queue);
if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
g_warning("can't queue the message\n");
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
return -1;
}
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
if (compose->mode == COMPOSE_REEDIT) {
gchar *std_headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
GString *header;
- /* struct utsname utsbuf; */
-
g_return_val_if_fail(compose->account != NULL, NULL);
g_return_val_if_fail(compose->account->address != NULL, NULL);
/* Subject */
str = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
+
if (*str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
g_strstrip(str);
if (*str != '\0') {
}
/* Program version and system info */
- /* uname(&utsbuf); */
if (g_slist_length(compose->to_list) && !IS_IN_CUSTOM_HEADER("X-Mailer") &&
!compose->newsgroup_list) {
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")) {
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);
- /* utsbuf.sysname, utsbuf.release, utsbuf.machine); */
}
/* custom headers */
gint header_len, gboolean addr_field)
{
gchar *tmpstr = NULL;
-
+ const gchar *out_codeset = NULL;
+
g_return_if_fail(src != NULL);
g_return_if_fail(dest != NULL);
subst_char(tmpstr, '\r', ' ');
g_strchomp(tmpstr);
+ if (!g_utf8_validate(tmpstr, -1, NULL)) {
+ gchar *mybuf = g_malloc(strlen(tmpstr)*2 +1);
+ conv_localetodisp(mybuf, strlen(tmpstr)*2 +1, tmpstr);
+ g_free(tmpstr);
+ tmpstr = mybuf;
+ }
+
+ codeconv_set_strict(TRUE);
conv_encode_header_full(dest, len, tmpstr, header_len, addr_field,
conv_get_charset_str(compose->out_encoding));
+ codeconv_set_strict(FALSE);
+
+ if (!dest || *dest == '\0') {
+ gchar *test_conv_global_out = NULL;
+ gchar *test_conv_reply = NULL;
+
+ /* automatic mode. be automatic. */
+ codeconv_set_strict(TRUE);
+
+ out_codeset = conv_get_outgoing_charset_str();
+ if (out_codeset) {
+ debug_print("trying to convert to %s\n", out_codeset);
+ test_conv_global_out = conv_codeset_strdup(src, CS_INTERNAL, out_codeset);
+ }
+
+ if (!test_conv_global_out && compose->orig_charset) {
+ out_codeset = compose->orig_charset;
+ debug_print("failure; trying to convert to %s\n", out_codeset);
+ test_conv_reply = conv_codeset_strdup(src, CS_INTERNAL, out_codeset);
+ }
+
+ if (!test_conv_global_out && !test_conv_reply) {
+ /* we're lost */
+ out_codeset = CS_INTERNAL;
+ debug_print("finally using %s\n", out_codeset);
+ }
+ g_free(test_conv_global_out);
+ g_free(test_conv_reply);
+ conv_encode_header_full(dest, len, tmpstr, header_len, addr_field,
+ out_codeset);
+ codeconv_set_strict(FALSE);
+ }
g_free(tmpstr);
}
GtkWidget *label;
GtkWidget *hbox;
GtkWidget *from_optmenu_hbox;
-#if 0 /* NEW COMPOSE GUI */
- GtkWidget *to_entry;
- GtkWidget *to_hbox;
- GtkWidget *newsgroups_entry;
- GtkWidget *newsgroups_hbox;
-#endif
GtkWidget *header_scrolledwin;
GtkWidget *header_table;
-#if 0 /* NEW COMPOSE GUI */
- GtkWidget *cc_entry;
- GtkWidget *cc_hbox;
- GtkWidget *bcc_entry;
- GtkWidget *bcc_hbox;
- GtkWidget *reply_entry;
- GtkWidget *reply_hbox;
- GtkWidget *followup_entry;
- GtkWidget *followup_hbox;
-#endif
gint count = 0;
from_optmenu_hbox = compose_account_option_menu_create(compose);
gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox,
1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
-#if 0 /* NEW COMPOSE GUI */
- gtk_table_set_row_spacing(GTK_TABLE(table), 0, 4);
-#endif
count++;
compose->header_table = header_table;
compose_create_header_entry(compose);
-#if 0 /* NEW COMPOSE GUI */
- compose_add_entry_field(table, &to_hbox, &to_entry, &count,
- "To:", TRUE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 0, 4);
- compose_add_entry_field(table, &newsgroups_hbox, &newsgroups_entry,
- &count, "Newsgroups:", FALSE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 1, 4);
-
- gtk_table_set_row_spacing(GTK_TABLE(table), 2, 4);
-
- compose_add_entry_field(table, &cc_hbox, &cc_entry, &count,
- "Cc:", TRUE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 3, 4);
- compose_add_entry_field(table, &bcc_hbox, &bcc_entry, &count,
- "Bcc:", TRUE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 4, 4);
- compose_add_entry_field(table, &reply_hbox, &reply_entry, &count,
- "Reply-To:", TRUE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 5, 4);
- compose_add_entry_field(table, &followup_hbox, &followup_entry, &count,
- "Followup-To:", FALSE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 6, 4);
-
- gtk_table_set_col_spacings(GTK_TABLE(table), 4);
-
- 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;
-#if 0 /* NEW COMPOSE GUI */
- compose->table = table;
- compose->to_hbox = to_hbox;
- compose->to_entry = to_entry;
- compose->newsgroups_hbox = newsgroups_hbox;
- compose->newsgroups_entry = newsgroups_entry;
-#endif
-#if 0 /* NEW COMPOSE GUI */
- compose->cc_hbox = cc_hbox;
- compose->cc_entry = cc_entry;
- compose->bcc_hbox = bcc_hbox;
- compose->bcc_entry = bcc_entry;
- compose->reply_hbox = reply_hbox;
- compose->reply_entry = reply_entry;
- compose->followup_hbox = followup_hbox;
- compose->followup_entry = followup_entry;
-#endif
return header_scrolledwin ;
}
g_free(path);
}
+static void entry_paste_clipboard(Compose *compose, GtkWidget *entry, gboolean wrap,
+ GdkAtom clip);
+
+#define BLOCK_WRAP() { \
+ prev_autowrap = compose->autowrap; \
+ buffer = gtk_text_view_get_buffer( \
+ GTK_TEXT_VIEW(compose->text)); \
+ compose->autowrap = FALSE; \
+ \
+ 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); \
+}
+#define UNBLOCK_WRAP() { \
+ compose->autowrap = prev_autowrap; \
+ if (compose->autowrap) \
+ compose_wrap_all(compose); \
+ \
+ 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); \
+}
+
+
+static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
+ Compose *compose)
+{
+ gint prev_autowrap;
+ GtkTextBuffer *buffer;
+ if (event->button == 2) {
+ BLOCK_WRAP();
+ entry_paste_clipboard(compose, compose->focused_editable,
+ prefs_common.linewrap_pastes,
+ GDK_SELECTION_PRIMARY);
+ UNBLOCK_WRAP();
+ return TRUE;
+ }
+ return FALSE;
+}
+
static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
{
Compose *compose;
titles[COL_NAME] = _("Name");
compose->account = account;
-
+
+ compose->mutex = g_mutex_new();
+
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
geometry.max_width = gdk_screen_width();
geometry.max_height = gdk_screen_height();
}
+
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
&geometry, GDK_HINT_MAX_SIZE);
if (!geometry.min_width) {
n_menu_entries, "<Compose>", compose);
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
- handlebox = gtk_handle_box_new();
+ if (prefs_common.toolbar_detachable) {
+ handlebox = gtk_handle_box_new();
+ } else {
+ handlebox = gtk_hbox_new(FALSE, 0);
+ }
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
gtk_widget_realize(handlebox);
G_CALLBACK(compose_grab_focus_cb), compose);
g_signal_connect(G_OBJECT(buffer), "insert_text",
G_CALLBACK(text_inserted), compose);
+ g_signal_connect(G_OBJECT(text), "button_press_event",
+ G_CALLBACK(text_clicked), compose);
/* drag and drop */
gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types,
}
color[0] = quote_color;
- cmap = gdk_window_get_colormap(window->window);
+ cmap = gdk_drawable_get_colormap(window->window);
gdk_colormap_alloc_colors(cmap, color, 1, FALSE, TRUE, success);
if (success[0] == FALSE) {
GtkStyle *style;
compose->exteditor_file = NULL;
compose->exteditor_pid = -1;
- compose->exteditor_readdes = -1;
compose->exteditor_tag = -1;
compose->draft_timeout_tag = -1;
/* Privacy Systems menu */
compose_update_privacy_systems_menu(compose);
- activate_privacy_system(compose, account);
+ activate_privacy_system(compose, account, TRUE);
toolbar_set_style(compose->toolbar->toolbar, compose->handlebox, prefs_common.toolbar_style);
gtk_widget_show(window);
menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
}
-static void compose_update_privacy_system_menu_item(Compose * compose)
+static void compose_update_privacy_system_menu_item(Compose * compose, gboolean warn)
{
static gchar *branch_path = "/Options/Privacy System";
GtkItemFactory *ifactory;
GtkWidget *menuitem = NULL;
GList *amenu;
gboolean can_sign = FALSE, can_encrypt = FALSE;
+ gboolean found = FALSE;
ifactory = gtk_item_factory_from_widget(compose->menubar);
GList *alist = amenu->next;
systemid = g_object_get_data(G_OBJECT(amenu->data), "privacy_system");
- if (systemid != NULL)
+ 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);
+ found = TRUE;
+ break;
+ }
+ } else if (strlen(compose->privacy_system) == 0) {
+ menuitem = GTK_WIDGET(amenu->data);
+ can_sign = FALSE;
+ can_encrypt = FALSE;
+ found = TRUE;
break;
- }
+ }
amenu = alist;
}
if (menuitem != NULL)
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- }
+
+ if (warn && !found && strlen(compose->privacy_system)) {
+ gchar *tmp = g_strdup_printf(
+ _("The privacy system '%s' cannot be loaded. You "
+ "will not be able to sign or encrypt this message."),
+ compose->privacy_system);
+ alertpanel_warning(tmp);
+ g_free(tmp);
+ }
+ }
menu_set_sensitive(ifactory, "/Options/Sign", can_sign);
menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
GtkTextIter iter;
gchar *qmark;
gchar *parsed_str;
-
+ gint cursor_pos = 0;
if (!tmpl || !tmpl->value) return;
text = GTK_TEXT_VIEW(compose->text);
gtk_text_buffer_get_start_iter(buffer, &iter);
gtk_text_buffer_place_cursor(buffer, &iter);
}
+
+ if (parsed_str) {
+ cursor_pos = quote_fmt_get_cursor_pos();
+ gtk_text_buffer_get_start_iter(buffer, &iter);
+ gtk_text_buffer_get_iter_at_offset(buffer, &iter, cursor_pos);
+ gtk_text_buffer_place_cursor(buffer, &iter);
+ }
if (parsed_str)
compose_changed_cb(NULL, compose);
g_free(compose->exteditor_file);
+ g_free(compose->orig_charset);
if (addressbook_get_target_compose() == compose)
addressbook_set_target_compose(NULL);
gtk_widget_destroy(compose->window);
toolbar_destroy(compose->toolbar);
g_free(compose->toolbar);
+ g_mutex_free(compose->mutex);
g_free(compose);
}
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
COL_MIMETYPE, ainfo->content_type,
COL_SIZE, text,
- COL_NAME, ainfo->file,
+ COL_NAME, ainfo->name,
-1);
break;
optmenu_menu = gtk_menu_new();
MENUITEM_ADD(optmenu_menu, menuitem, "7bit", ENC_7BIT);
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
-#if 0
- gtk_widget_set_sensitive(menuitem, FALSE);
-#endif
MENUITEM_ADD(optmenu_menu, menuitem, "8bit", ENC_8BIT);
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
-#if 0
- gtk_widget_set_sensitive(menuitem, FALSE);
-#endif
MENUITEM_ADD(optmenu_menu, menuitem, "quoted-printable",
ENC_QUOTED_PRINTABLE);
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
static void compose_exec_ext_editor(Compose *compose)
{
+#ifdef G_OS_UNIX
gchar *tmp;
pid_t pid;
gint pipe_fds[2];
compose->exteditor_file = g_strdup(tmp);
compose->exteditor_pid = pid;
- compose->exteditor_readdes = pipe_fds[0];
compose_set_ext_editor_sensitive(compose, FALSE);
- compose->exteditor_tag =
- gdk_input_add(pipe_fds[0], GDK_INPUT_READ,
- compose_input_cb, compose);
+ compose->exteditor_ch = g_io_channel_unix_new(pipe_fds[0]);
+ compose->exteditor_tag = g_io_add_watch(compose->exteditor_ch,
+ G_IO_IN,
+ compose_input_cb,
+ compose);
} else { /* process-monitoring process */
pid_t pid_ed;
}
g_free(tmp);
+#endif /* G_OS_UNIX */
}
+#ifdef G_OS_UNIX
static gint compose_exec_ext_editor_real(const gchar *file)
{
static gchar *def_cmd = "emacs %s";
g_snprintf(buf, sizeof(buf), prefs_common.ext_editor_cmd, file);
} else {
if (prefs_common.ext_editor_cmd)
- g_warning("External editor command line is invalid: `%s'\n",
+ g_warning("External editor command line is invalid: '%s'\n",
prefs_common.ext_editor_cmd);
g_snprintf(buf, sizeof(buf), def_cmd, file);
}
(_("The external editor is still working.\n"
"Force terminating the process?\n"
"process group id: %d"), -pgid);
- val = alertpanel(_("Notice"), msg, _("Yes"), _("+No"), NULL);
+ val = alertpanel_full(_("Notice"), msg, GTK_STOCK_YES, GTK_STOCK_NO,
+ NULL, FALSE, NULL, ALERT_WARNING, G_ALERTALTERNATE);
+
g_free(msg);
if (val == G_ALERTDEFAULT) {
- gdk_input_remove(compose->exteditor_tag);
- close(compose->exteditor_readdes);
+ g_source_remove(compose->exteditor_tag);
+ g_io_channel_shutdown(compose->exteditor_ch,
+ FALSE, NULL);
+ g_io_channel_unref(compose->exteditor_ch);
if (kill(pgid, SIGTERM) < 0) perror("kill");
waitpid(compose->exteditor_pid, NULL, 0);
g_free(compose->exteditor_file);
compose->exteditor_file = NULL;
compose->exteditor_pid = -1;
- compose->exteditor_readdes = -1;
+ compose->exteditor_ch = NULL;
compose->exteditor_tag = -1;
} else
return FALSE;
return TRUE;
}
-static void compose_input_cb(gpointer data, gint source,
- GdkInputCondition condition)
+static gboolean compose_input_cb(GIOChannel *source, GIOCondition condition,
+ gpointer data)
{
- gchar buf[3];
+ gchar buf[3] = "3";
Compose *compose = (Compose *)data;
- gint i = 0;
+ gsize bytes_read;
- debug_print("Compose: input from monitoring process\n");
+ debug_print(_("Compose: input from monitoring process\n"));
- gdk_input_remove(compose->exteditor_tag);
+ g_io_channel_read_chars(source, buf, sizeof(buf), &bytes_read, NULL);
- for (;;) {
- if (read(source, &buf[i], 1) < 1) {
- buf[0] = '3';
- break;
- }
- if (buf[i] == '\n') {
- buf[i] = '\0';
- break;
- }
- i++;
- if (i == sizeof(buf) - 1)
- break;
- }
+ g_io_channel_shutdown(source, FALSE, NULL);
+ g_io_channel_unref(source);
waitpid(compose->exteditor_pid, NULL, 0);
compose_insert_file(compose, compose->exteditor_file);
compose_changed_cb(NULL, compose);
- if (unlink(compose->exteditor_file) < 0)
+ if (g_unlink(compose->exteditor_file) < 0)
FILE_OP_ERROR(compose->exteditor_file, "unlink");
} else if (buf[0] == '1') { /* failed */
g_warning("Couldn't exec external editor\n");
- if (unlink(compose->exteditor_file) < 0)
+ if (g_unlink(compose->exteditor_file) < 0)
FILE_OP_ERROR(compose->exteditor_file, "unlink");
} else if (buf[0] == '2') {
g_warning("Couldn't write to file\n");
g_warning("Pipe read failed\n");
}
- close(source);
-
compose_set_ext_editor_sensitive(compose, TRUE);
g_free(compose->exteditor_file);
compose->exteditor_file = NULL;
compose->exteditor_pid = -1;
- compose->exteditor_readdes = -1;
+ compose->exteditor_ch = NULL;
compose->exteditor_tag = -1;
+
+ return FALSE;
}
static void compose_set_ext_editor_sensitive(Compose *compose,
gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
}
+#endif /* G_OS_UNIX */
/**
* compose_undo_state_changed:
gpointer data)
{
Compose *compose = (Compose *)data;
-
+ GtkTreeSelection *attach_selection;
+ gint attach_nr_selected;
+ GtkItemFactory *ifactory;
+
if (!event) return FALSE;
if (event->button == 3) {
+ attach_selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
+ attach_nr_selected = gtk_tree_selection_count_selected_rows(attach_selection);
+ ifactory = gtk_item_factory_from_widget(compose->popupmenu);
+
+ if (attach_nr_selected > 0)
+ {
+ menu_set_sensitive(ifactory, "/Remove", TRUE);
+ menu_set_sensitive(ifactory, "/Properties...", TRUE);
+ } else {
+ menu_set_sensitive(ifactory, "/Remove", FALSE);
+ menu_set_sensitive(ifactory, "/Properties...", FALSE);
+ }
+
gtk_menu_popup(GTK_MENU(compose->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
return TRUE;
{
Compose *compose = (Compose *)data;
- if (prefs_common.work_offline)
- if (alertpanel(_("Offline warning"),
- _("You're working offline. Override?"),
- _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
- return;
+ if (prefs_common.work_offline && !inc_offline_should_override())
+ return;
if (compose->draft_timeout_tag != -1) { /* CLAWS: disable draft timeout */
gtk_timeout_remove(compose->draft_timeout_tag);
draft = account_get_special_folder(compose->account, F_DRAFT);
g_return_if_fail(draft != NULL);
-
+
+ if (!g_mutex_trylock(compose->mutex)) {
+ /* we don't want to lock the mutex once it's available,
+ * because as the only other part of compose.c locking
+ * it is compose_close - which means once unlocked,
+ * the compose struct will be freed */
+ debug_print("couldn't lock mutex, probably sending\n");
+ return;
+ }
+
lock = TRUE;
tmp = g_strdup_printf("%s%cdraft.%p", get_tmp_dir(),
G_DIR_SEPARATOR, compose);
- if ((fp = fopen(tmp, "wb")) == NULL) {
+ if ((fp = g_fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
- return;
+ goto unlock;
}
/* chmod for security */
if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE) < 0) {
fclose(fp);
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
- lock = FALSE;
- return;
+ goto unlock;
}
fclose(fp);
folder_item_scan(draft);
if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
- lock = FALSE;
- return;
+ if (action != COMPOSE_AUTO_SAVE)
+ alertpanel_error(_("Could not save draft."));
+ goto unlock;
}
g_free(tmp);
draft->mtime = 0; /* force updating */
folder_item_scan(draft);
- lock = FALSE;
-
- if (action == COMPOSE_QUIT_EDITING)
+ if (action == COMPOSE_QUIT_EDITING) {
+ lock = FALSE;
+ g_mutex_unlock(compose->mutex); /* must be done before closing */
compose_close(compose);
- else {
+ return;
+ } else {
struct stat s;
gchar *path;
path = folder_item_fetch_msg(draft, msgnum);
g_return_if_fail(path != NULL);
- if (stat(path, &s) < 0) {
+ if (g_stat(path, &s) < 0) {
FILE_OP_ERROR(path, "stat");
g_free(path);
- lock = FALSE;
- return;
+ goto unlock;
}
g_free(path);
if (action == COMPOSE_AUTO_SAVE) {
compose->autosaved_draft = compose->targetinfo;
}
+ compose->modified = FALSE;
+ compose_set_title(compose);
}
+unlock:
+ lock = FALSE;
+ g_mutex_unlock(compose->mutex);
}
static void compose_attach_cb(gpointer data, guint action, GtkWidget *widget)
Compose *compose = (Compose *)data;
AlertValue val;
+#ifdef G_OS_UNIX
if (compose->exteditor_tag != -1) {
if (!compose_ext_editor_kill(compose))
return;
}
+#endif
if (compose->modified) {
val = alertpanel(_("Discard message"),
- _("This message has been modified. discard it?"),
- _("Discard"), _("to Draft"), GTK_STOCK_CANCEL);
+ _("This message has been modified. Discard it?"),
+ _("_Discard"), _("_Save to Drafts"), GTK_STOCK_CANCEL);
switch (val) {
case G_ALERTDEFAULT:
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' ?"),
+ msg = g_strdup_printf(_("Do you want to apply the template '%s' ?"),
tmpl->name);
val = alertpanel(_("Apply template"), msg,
- _("Replace"), _("Insert"), GTK_STOCK_CANCEL);
+ _("_Replace"), _("_Insert"), GTK_STOCK_CANCEL);
g_free(msg);
if (val == G_ALERTDEFAULT)
gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
}
-static void entry_paste_clipboard(GtkWidget *entry)
+static void entry_paste_clipboard(Compose *compose, GtkWidget *entry,
+ gboolean wrap, GdkAtom clip)
{
- if (GTK_IS_EDITABLE(entry))
+ if (GTK_IS_TEXT_VIEW(entry)) {
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry));
+ GtkTextMark *mark_start = gtk_text_buffer_get_insert(buffer);
+ GtkTextIter start_iter, end_iter;
+ gint start, end;
+
+ gchar *contents = gtk_clipboard_wait_for_text(gtk_clipboard_get(clip));
+
+ if (contents == NULL)
+ return;
+
+ gtk_text_buffer_delete_selection(buffer, FALSE, TRUE);
+ gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark_start);
+
+ start = gtk_text_iter_get_offset(&start_iter);
+
+ gtk_text_buffer_insert(buffer, &start_iter, contents, strlen(contents));
+
+ if (!wrap) {
+ end = start + strlen(contents);
+ gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, start);
+ gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, end);
+ gtk_text_buffer_apply_tag_by_name(buffer, "no_wrap", &start_iter, &end_iter);
+ } else if (wrap && clip == GDK_SELECTION_PRIMARY) {
+ mark_start = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark_start);
+ gtk_text_iter_backward_char(&start_iter);
+ compose_beautify_paragraph(compose, &start_iter, TRUE);
+ }
+
+ } else 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_SELECTION_CLIPBOARD),
- NULL, TRUE);
+
}
static void entry_allsel(GtkWidget *entry)
static void compose_paste_cb(Compose *compose)
{
+ gint prev_autowrap;
+ GtkTextBuffer *buffer;
+ BLOCK_WRAP();
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- entry_paste_clipboard(compose->focused_editable);
+ entry_paste_clipboard(compose, compose->focused_editable,
+ prefs_common.linewrap_pastes,
+ GDK_SELECTION_CLIPBOARD);
+ UNBLOCK_WRAP();
}
static void compose_paste_as_quote_cb(Compose *compose)
{
+ gint wrap_quote = prefs_common.linewrap_quote;
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable)) {
/* let text_insert() (called directly or at a later time
g_object_set_data(G_OBJECT(compose->focused_editable),
"paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation + 1));
- entry_paste_clipboard(compose->focused_editable);
+ prefs_common.linewrap_quote = prefs_common.linewrap_pastes;
+ entry_paste_clipboard(compose, compose->focused_editable,
+ prefs_common.linewrap_pastes,
+ GDK_SELECTION_CLIPBOARD);
+ prefs_common.linewrap_quote = wrap_quote;
}
}
+static void compose_paste_no_wrap_cb(Compose *compose)
+{
+ gint prev_autowrap;
+ GtkTextBuffer *buffer;
+ BLOCK_WRAP();
+ if (compose->focused_editable &&
+ GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ entry_paste_clipboard(compose, compose->focused_editable, FALSE,
+ GDK_SELECTION_CLIPBOARD);
+ UNBLOCK_WRAP();
+}
+
+static void compose_paste_wrap_cb(Compose *compose)
+{
+ gint prev_autowrap;
+ GtkTextBuffer *buffer;
+ BLOCK_WRAP();
+ if (compose->focused_editable &&
+ GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ entry_paste_clipboard(compose, compose->focused_editable, TRUE,
+ GDK_SELECTION_CLIPBOARD);
+ UNBLOCK_WRAP();
+}
+
static void compose_allsel_cb(Compose *compose)
{
if (compose->focused_editable &&
gtk_editable_set_position(GTK_EDITABLE(widget),
strlen(str));
g_free(str);
+ if (widget->parent && widget->parent->parent
+ && widget->parent->parent->parent) {
+ if (GTK_IS_SCROLLED_WINDOW(widget->parent->parent->parent)) {
+ gint y = widget->allocation.y;
+ gint height = widget->allocation.height;
+ GtkAdjustment *shown = gtk_scrolled_window_get_vadjustment
+ (GTK_SCROLLED_WINDOW(widget->parent->parent->parent));
+
+ if (y < (int)shown->value) {
+ gtk_adjustment_set_value(GTK_ADJUSTMENT(shown), y - 1);
+ }
+ if (y + height > (int)shown->value + (int)shown->page_size) {
+ if (y - height - 1 < (int)shown->upper - (int)shown->page_size) {
+ gtk_adjustment_set_value(GTK_ADJUSTMENT(shown),
+ y + height - (int)shown->page_size - 1);
+ } else {
+ gtk_adjustment_set_value(GTK_ADJUSTMENT(shown),
+ (int)shown->upper - (int)shown->page_size - 1);
+ }
+ }
+ }
+ }
}
if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
{
- if (compose->modified == FALSE) {
- compose->modified = TRUE;
- compose_set_title(compose);
- }
+ compose->modified = TRUE;
+ compose_set_title(compose);
}
static void compose_wrap_cb(gpointer data, guint action, GtkWidget *widget)
Compose *compose = (Compose *)data;
if (action == 1)
- compose_wrap_all(compose);
+ compose_wrap_all_full(compose, TRUE);
else
- compose_wrap_paragraph(compose, NULL);
+ compose_beautify_paragraph(compose, NULL, TRUE);
}
static void compose_toggle_autowrap_cb(gpointer data, guint action,
compose->use_encryption = FALSE;
}
-static void activate_privacy_system(Compose *compose, PrefsAccount *account)
+static void activate_privacy_system(Compose *compose, PrefsAccount *account, gboolean warn)
{
g_free(compose->privacy_system);
+
compose->privacy_system = g_strdup(account->default_privacy_system);
- compose_update_privacy_system_menu_item(compose);
+ compose_update_privacy_system_menu_item(compose, warn);
}
static void compose_toggle_ruler_cb(gpointer data, guint action,
{
Compose *compose = (Compose *)user_data;
GList *list, *tmp;
-
- if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+
+ if (gdk_atom_name(data->type) &&
+ !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
list = uri_list_extract_filenames((const gchar *)data->data);
for (tmp = list; tmp != NULL; tmp = tmp->next)
compose_attach_append
if (list) compose_changed_cb(NULL, compose);
list_free_strings(list);
g_list_free(list);
+ } else if (gdk_atom_name(data->type) &&
+ !strcmp(gdk_atom_name(data->type), "text/plain") &&
+ data->data && !strcmp(data->data, "Dummy-Summaryview")) {
+ /* comes from our summaryview */
+ SummaryView * summaryview = NULL;
+ GSList * list = NULL, *cur = NULL;
+
+ if (mainwindow_get_mainwindow())
+ summaryview = mainwindow_get_mainwindow()->summaryview;
+
+ if (summaryview)
+ list = summary_get_selected_msg_list(summaryview);
+
+ for (cur = list; cur; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+ gchar *file = NULL;
+ if (msginfo)
+ file = procmsg_get_message_file_full(msginfo,
+ TRUE, TRUE);
+ if (file) {
+ compose_attach_append(compose, (const gchar *)file,
+ (const gchar *)file, "message/rfc822");
+ g_free(file);
+ }
+ }
+ g_slist_free(list);
}
}
gchar *tmpfile = get_tmp_file();
str_write_to_file((const gchar *)data->data, tmpfile);
compose_insert_file(compose, tmpfile);
- unlink(tmpfile);
+ g_unlink(tmpfile);
g_free(tmpfile);
gtk_drag_finish(drag_context, TRUE, FALSE, time);
return;
gtk_drag_finish(drag_context, TRUE, FALSE, time);
}
-#if 0 /* NEW COMPOSE GUI */
-static void to_activated(GtkWidget *widget, Compose *compose)
-{
- if (GTK_WIDGET_VISIBLE(compose->newsgroups_entry))
- gtk_widget_grab_focus(compose->newsgroups_entry);
- else
- gtk_widget_grab_focus(compose->subject_entry);
-}
-
-static void newsgroups_activated(GtkWidget *widget, Compose *compose)
-{
- gtk_widget_grab_focus(compose->subject_entry);
-}
-
-static void subject_activated(GtkWidget *widget, Compose *compose)
-{
- if (GTK_WIDGET_VISIBLE(compose->cc_entry))
- gtk_widget_grab_focus(compose->cc_entry);
- else if (GTK_WIDGET_VISIBLE(compose->bcc_entry))
- gtk_widget_grab_focus(compose->bcc_entry);
- else if (GTK_WIDGET_VISIBLE(compose->reply_entry))
- gtk_widget_grab_focus(compose->reply_entry);
- else if (GTK_WIDGET_VISIBLE(compose->followup_entry))
- gtk_widget_grab_focus(compose->followup_entry);
- else
- gtk_widget_grab_focus(compose->text);
-}
-
-static void cc_activated(GtkWidget *widget, Compose *compose)
-{
- if (GTK_WIDGET_VISIBLE(compose->bcc_entry))
- gtk_widget_grab_focus(compose->bcc_entry);
- else if (GTK_WIDGET_VISIBLE(compose->reply_entry))
- gtk_widget_grab_focus(compose->reply_entry);
- else if (GTK_WIDGET_VISIBLE(compose->followup_entry))
- gtk_widget_grab_focus(compose->followup_entry);
- else
- gtk_widget_grab_focus(compose->text);
-}
-
-static void bcc_activated(GtkWidget *widget, Compose *compose)
-{
- if (GTK_WIDGET_VISIBLE(compose->reply_entry))
- gtk_widget_grab_focus(compose->reply_entry);
- else if (GTK_WIDGET_VISIBLE(compose->followup_entry))
- gtk_widget_grab_focus(compose->followup_entry);
- else
- gtk_widget_grab_focus(compose->text);
-}
-
-static void replyto_activated(GtkWidget *widget, Compose *compose)
-{
- if (GTK_WIDGET_VISIBLE(compose->followup_entry))
- gtk_widget_grab_focus(compose->followup_entry);
- else
- gtk_widget_grab_focus(compose->text);
-}
-
-static void followupto_activated(GtkWidget *widget, Compose *compose)
-{
- gtk_widget_grab_focus(compose->text);
-}
-#endif
-
static void compose_toggle_return_receipt_cb(gpointer data, guint action,
GtkWidget *widget)
{
(G_OBJECT(compose->text), "paste_as_quotation"));
GtkTextMark *mark;
- /* CLAWS: pass to default handler only if not pasting as quotation, and
- * no autowrap */
- if (!paste_as_quotation && !compose->autowrap)
- return;
-
g_return_if_fail(text != NULL);
g_signal_handlers_block_by_func(G_OBJECT(buffer),
qmark = prefs_common.quotemark;
else
qmark = "> ";
+
+ mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
gtk_text_buffer_place_cursor(buffer, iter);
+
compose_quote_fmt(compose, NULL, "%Q", qmark, new_text);
g_free(new_text);
g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation - 1));
+
+ gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
} else
gtk_text_buffer_insert(buffer, iter, text, len);
mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
- compose_wrap_all_full(compose, TRUE);
+
+ compose_beautify_paragraph(compose, iter, FALSE);
+
gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
gtk_text_buffer_delete_mark(buffer, mark);
return account;
}
-static void compose_close(Compose *compose)
+static gboolean compose_close(Compose *compose)
{
gint x, y;
- g_return_if_fail(compose);
+ if (!g_mutex_trylock(compose->mutex)) {
+ /* we have to wait for the (possibly deferred by auto-save)
+ * drafting to be done, before destroying the compose under
+ * it. */
+ debug_print("waiting for drafting to finish...\n");
+ g_timeout_add (500, (GSourceFunc) compose_close, compose);
+ return FALSE;
+ }
+ g_return_val_if_fail(compose, FALSE);
gtkut_widget_get_uposition(compose->window, &x, &y);
prefs_common.compose_x = x;
prefs_common.compose_y = y;
+ g_mutex_unlock(compose->mutex);
compose_destroy(compose);
+ return FALSE;
}
/**
gchar *body;
GSList *new_msglist = NULL;
MsgInfo *tmp_msginfo = NULL;
-
+ gboolean originally_enc = FALSE;
+ Compose *compose = NULL;
+
g_return_if_fail(msgview != NULL);
g_return_if_fail(msginfo_list != NULL);
if (mimeinfo != NULL && mimeinfo->type == MIMETYPE_MESSAGE &&
!g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
-
tmp_msginfo = procmsg_msginfo_new_from_mimeinfo(
orig_msginfo, mimeinfo);
if (tmp_msginfo != NULL) {
new_msglist = g_slist_append(NULL, tmp_msginfo);
+ if (procmime_msginfo_is_encrypted(orig_msginfo)) {
+ originally_enc = TRUE;
+ }
}
}
}
body = messageview_get_selection(msgview);
if (new_msglist) {
- compose_reply_mode((ComposeMode)action, new_msglist, body);
+ compose = compose_reply_mode((ComposeMode)action, new_msglist, body);
procmsg_msginfo_free(tmp_msginfo);
g_slist_free(new_msglist);
} else
- compose_reply_mode((ComposeMode)action, msginfo_list, body);
+ compose = compose_reply_mode((ComposeMode)action, msginfo_list, body);
+
+ if (originally_enc) {
+ compose_force_encryption(compose, compose->account, FALSE);
+ }
g_free(body);
}
projects / claws.git / blobdiff