/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2008 Hiroyuki Yamamoto and the Claws Mail team
*
* 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 <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkitemfactory.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkhandlebox.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreemodel.h>
-
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkclipboard.h>
+#include <gtk/gtk.h>
+
#include <pango/pango-break.h>
#include <stdio.h>
#include <stdlib.h>
#include "hooks.h"
#include "privacy.h"
#include "timing.h"
+#include "autofaces.h"
enum
{
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;
static void compose_destroy (Compose *compose);
static void compose_entries_set (Compose *compose,
- const gchar *mailto);
+ const gchar *mailto,
+ ComposeEntryType to_type);
static gint compose_parse_header (Compose *compose,
MsgInfo *msginfo);
static gchar *compose_parse_references (const gchar *ref,
static void compose_insert_sig (Compose *compose,
gboolean replace);
-static gchar *compose_get_signature_str (Compose *compose);
static ComposeInsertResult compose_insert_file (Compose *compose,
const gchar *file);
gboolean addr_field);
static void compose_attach_info_free (AttachInfo *ainfo);
-static void compose_attach_remove_selected (Compose *compose);
+static void compose_attach_remove_selected (GtkAction *action,
+ gpointer data);
-static void compose_attach_property (Compose *compose);
+static void compose_attach_property (GtkAction *action,
+ gpointer data);
static void compose_attach_property_create (gboolean *cancelled);
static void attach_property_ok (GtkWidget *widget,
gboolean *cancelled);
static void compose_remove_header_entries(Compose *compose);
static void compose_update_priority_menu_item(Compose * compose);
-#if USE_ASPELL
+#if USE_ENCHANT
static void compose_spell_menu_changed (void *data);
#endif
static void compose_add_field_list ( Compose *compose,
static gboolean attach_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static void compose_send_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_send_later_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void compose_draft_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void compose_attach_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_insert_file_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_insert_sig_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void compose_close_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void compose_set_encoding_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void compose_address_cb (gpointer data,
- guint action,
- GtkWidget *widget);
+static void compose_send_cb (GtkAction *action, gpointer data);
+static void compose_send_later_cb (GtkAction *action, gpointer data);
+
+static void compose_save_cb (GtkAction *action,
+ gpointer data);
+
+static void compose_attach_cb (GtkAction *action,
+ gpointer data);
+static void compose_insert_file_cb (GtkAction *action,
+ gpointer data);
+static void compose_insert_sig_cb (GtkAction *action,
+ gpointer data);
+
+static void compose_close_cb (GtkAction *action,
+ gpointer data);
+
+static void compose_set_encoding_cb (GtkAction *action, GtkRadioAction *current, gpointer data);
+
+static void compose_address_cb (GtkAction *action,
+ gpointer data);
+static void about_show_cb (GtkAction *action,
+ gpointer data);
static void compose_template_activate_cb(GtkWidget *widget,
gpointer data);
-static void compose_ext_editor_cb (gpointer data,
- guint action,
- GtkWidget *widget);
+static void compose_ext_editor_cb (GtkAction *action,
+ gpointer data);
static gint compose_delete_cb (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
-static void compose_undo_cb (Compose *compose);
-static void compose_redo_cb (Compose *compose);
-static void compose_cut_cb (Compose *compose);
-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_undo_cb (GtkAction *action,
+ gpointer data);
+static void compose_redo_cb (GtkAction *action,
+ gpointer data);
+static void compose_cut_cb (GtkAction *action,
+ gpointer data);
+static void compose_copy_cb (GtkAction *action,
+ gpointer data);
+static void compose_paste_cb (GtkAction *action,
+ gpointer data);
+static void compose_paste_as_quote_cb (GtkAction *action,
+ gpointer data);
+static void compose_paste_no_wrap_cb (GtkAction *action,
+ gpointer data);
+static void compose_paste_wrap_cb (GtkAction *action,
+ gpointer data);
+static void compose_allsel_cb (GtkAction *action,
+ gpointer data);
-static void compose_advanced_action_cb (Compose *compose,
- ComposeCallAdvancedAction action);
+static void compose_advanced_action_cb (GtkAction *action,
+ gpointer data);
static void compose_grab_focus_cb (GtkWidget *widget,
Compose *compose);
static void compose_changed_cb (GtkTextBuffer *textbuf,
Compose *compose);
-static void compose_wrap_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_find_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_toggle_autowrap_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void compose_toggle_ruler_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-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_privacy_system_cb(GtkWidget *widget,
- gpointer data);
+static void compose_wrap_cb (GtkAction *action,
+ gpointer data);
+static void compose_wrap_all_cb (GtkAction *action,
+ gpointer data);
+static void compose_find_cb (GtkAction *action,
+ gpointer data);
+static void compose_toggle_autowrap_cb (GtkToggleAction *action,
+ gpointer data);
+static void compose_toggle_autoindent_cb(GtkToggleAction *action,
+ gpointer data);
+
+static void compose_toggle_ruler_cb (GtkToggleAction *action,
+ gpointer data);
+static void compose_toggle_sign_cb (GtkToggleAction *action,
+ gpointer data);
+static void compose_toggle_encrypt_cb (GtkToggleAction *action,
+ gpointer data);
+static void compose_set_privacy_system_cb(GtkWidget *widget, gpointer data);
static void compose_update_privacy_system_menu_item(Compose * compose, gboolean warn);
static void activate_privacy_system (Compose *compose,
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,
- GtkWidget *widget);
-static void compose_toggle_remove_refs_cb(gpointer data, guint action,
- GtkWidget *widget);
-static void compose_set_priority_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_reply_change_mode (gpointer data,
- ComposeMode action,
- GtkWidget *widget);
+static void compose_toggle_return_receipt_cb(GtkToggleAction *action,
+ gpointer data);
+static void compose_toggle_remove_refs_cb(GtkToggleAction *action,
+ gpointer data);
+static void compose_set_priority_cb (GtkAction *action, GtkRadioAction *current, gpointer data);
+static void compose_reply_change_mode (Compose *compose, ComposeMode action);
+static void compose_reply_change_mode_cb(GtkAction *action, GtkRadioAction *current, gpointer data);
static void compose_attach_drag_received_cb (GtkWidget *widget,
GdkDragContext *drag_context,
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 void compose_check_backwards (Compose *compose);
-static void compose_check_forwards_go (Compose *compose);
+static void compose_nothing_cb (GtkAction *action, gpointer data)
+{
+
+}
+
+#if USE_ENCHANT
+static void compose_check_all (GtkAction *action, gpointer data);
+static void compose_highlight_all (GtkAction *action, gpointer data);
+static void compose_check_backwards (GtkAction *action, gpointer data);
+static void compose_check_forwards_go (GtkAction *action, gpointer data);
#endif
static gint compose_defer_auto_save_draft (Compose *compose);
static MsgInfo *compose_msginfo_new_from_compose(Compose *compose);
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
static void compose_set_dictionaries_from_folder_prefs(Compose *compose,
FolderItem *folder_item);
#endif
static void compose_attach_from_list(Compose *compose, GList *file_list, gboolean free_data);
-static GtkItemFactoryEntry compose_popup_entries[] =
+static GtkActionEntry compose_popup_entries[] =
{
- {N_("/_Add..."), NULL, compose_attach_cb, 0, NULL},
- {N_("/_Remove"), NULL, compose_attach_remove_selected, 0, NULL},
- {"/---", NULL, NULL, 0, "<Separator>"},
- {N_("/_Properties..."), NULL, compose_attach_property, 0, NULL}
+ {"Compose", NULL, "Compose" },
+ {"Compose/Add", NULL, N_("_Add..."), NULL, NULL, G_CALLBACK(compose_attach_cb) },
+ {"Compose/Remove", NULL, N_("_Remove"), NULL, NULL, G_CALLBACK(compose_attach_remove_selected) },
+ {"Compose/---", NULL, "---", NULL, NULL, NULL },
+ {"Compose/Properties", NULL, N_("_Properties..."), NULL, NULL, G_CALLBACK(compose_attach_property) },
};
-static GtkItemFactoryEntry compose_entries[] =
-{
- {N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/S_end"), "<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/_Redo"), "<control>Y", compose_redo_cb, 0, NULL},
- {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
- {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/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"),
- "<shift><control>B",
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER,
- NULL},
- {N_("/_Edit/A_dvanced/Move a character forward"),
- "<shift><control>F",
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER,
- NULL},
- {N_("/_Edit/A_dvanced/Move a word backward"),
- NULL, /* "<alt>B" */
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_WORD,
- NULL},
- {N_("/_Edit/A_dvanced/Move a word forward"),
- NULL, /* "<alt>F" */
- 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_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE,
- NULL},
- {N_("/_Edit/A_dvanced/Move to end of line"),
- "<control>E",
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_MOVE_END_OF_LINE,
- NULL},
- {N_("/_Edit/A_dvanced/Move to previous line"),
- "<control>P",
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_MOVE_PREVIOUS_LINE,
- NULL},
- {N_("/_Edit/A_dvanced/Move to next line"),
- "<control>N",
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_MOVE_NEXT_LINE,
- NULL},
- {N_("/_Edit/A_dvanced/Delete a character backward"),
- "<control>H",
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_CHARACTER,
- NULL},
- {N_("/_Edit/A_dvanced/Delete a character forward"),
- "<control>D",
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_CHARACTER,
- NULL},
- {N_("/_Edit/A_dvanced/Delete a word backward"),
- NULL, /* "<control>W" */
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD,
- NULL},
- {N_("/_Edit/A_dvanced/Delete a word forward"),
- NULL, /* "<alt>D", */
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD,
- NULL},
- {N_("/_Edit/A_dvanced/Delete line"),
- "<control>U",
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE,
- NULL},
- {N_("/_Edit/A_dvanced/Delete entire line"),
- NULL,
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE_N,
- NULL},
- {N_("/_Edit/A_dvanced/Delete to end of line"),
- "<control>K",
- compose_advanced_action_cb,
- COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END,
- NULL},
- {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit/_Find"),
- "<control>F", compose_find_cb, 0, NULL},
- {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit/_Wrap current paragraph"),
- "<control>L", compose_wrap_cb, 0, NULL},
- {N_("/_Edit/Wrap all long _lines"),
- "<control><alt>L", compose_wrap_cb, 1, 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"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Spelling/_Check all or check selection"),
- NULL, compose_check_all, 0, NULL},
- {N_("/_Spelling/_Highlight all misspelled words"),
- NULL, compose_highlight_all, 0, NULL},
- {N_("/_Spelling/Check _backwards misspelled word"),
- NULL, compose_check_backwards , 0, NULL},
- {N_("/_Spelling/_Forward to next misspelled word"),
- NULL, compose_check_forwards_go, 0, NULL},
- {N_("/_Spelling/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Spelling/Options"),
- NULL, NULL, 0, "<Branch>"},
+static GtkActionEntry compose_entries[] =
+{
+ {"Menu", NULL, "Menu" },
+/* menus */
+ {"Message", NULL, N_("_Message") },
+ {"Edit", NULL, N_("_Edit") },
+#if USE_ENCHANT
+ {"Spelling", NULL, N_("_Spelling") },
#endif
- {N_("/_Options"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Reply _mode"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Reply _mode/_Normal"), NULL, compose_reply_change_mode, COMPOSE_REPLY, "<RadioItem>"},
- {N_("/_Options/Reply _mode/_All"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_ALL, "/Options/Reply mode/Normal"},
- {N_("/_Options/Reply _mode/_Sender"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_SENDER, "/Options/Reply mode/Normal"},
- {N_("/_Options/Reply _mode/_Mailing-list"), NULL, compose_reply_change_mode, COMPOSE_REPLY_TO_LIST, "/Options/Reply mode/Normal"},
- {N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Options/Privacy _System"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Privacy _System/None"), NULL, NULL, 0, "<RadioItem>"},
- {N_("/_Options/Si_gn"), NULL, compose_toggle_sign_cb , 0, "<ToggleItem>"},
- {N_("/_Options/_Encrypt"), NULL, compose_toggle_encrypt_cb, 0, "<ToggleItem>"},
- {N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
- {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/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Options/Remo_ve references"), NULL, compose_toggle_remove_refs_cb, 0, "<ToggleItem>"},
- {N_("/_Options/---"), NULL, NULL, 0, "<Separator>"},
-
-#define ENC_ACTION(action) \
- NULL, compose_set_encoding_cb, action, \
- "/Options/Character encoding/Automatic"
-
- {N_("/_Options/Character _encoding"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Character _encoding/_Automatic"),
- NULL, compose_set_encoding_cb, C_AUTO, "<RadioItem>"},
- {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
-
- {N_("/_Options/Character _encoding/7bit ASCII (US-ASC_II)"),
- ENC_ACTION(C_US_ASCII)},
- {N_("/_Options/Character _encoding/Unicode (_UTF-8)"),
- ENC_ACTION(C_UTF_8)},
- {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
-
- {N_("/_Options/Character _encoding/Western European"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Character _encoding/Western European/ISO-8859-_1"),
- ENC_ACTION(C_ISO_8859_1)},
- {N_("/_Options/Character _encoding/Western European/ISO-8859-15"),
- ENC_ACTION(C_ISO_8859_15)},
- {N_("/_Options/Character _encoding/Western European/Windows-1252"),
- ENC_ACTION(C_WINDOWS_1252)},
-
- {N_("/_Options/Character _encoding/Central European (ISO-8859-_2)"),
- ENC_ACTION(C_ISO_8859_2)},
-
- {N_("/_Options/Character _encoding/Baltic"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Character _encoding/Baltic/ISO-8859-13"),
- ENC_ACTION(C_ISO_8859_13)},
- {N_("/_Options/Character _encoding/Baltic/ISO-8859-_4"),
- ENC_ACTION(C_ISO_8859_4)},
-
- {N_("/_Options/Character _encoding/Greek (ISO-8859-_7)"),
- ENC_ACTION(C_ISO_8859_7)},
-
- {N_("/_Options/Character _encoding/Hebrew"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Character _encoding/Hebrew/ISO-8859-_8"),
- ENC_ACTION(C_ISO_8859_8)},
- {N_("/_Options/Character _encoding/Hebrew/Windows-1255"),
- ENC_ACTION(C_WINDOWS_1255)},
-
- {N_("/_Options/Character _encoding/Arabic"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Character _encoding/Arabic/ISO-8859-_6"),
- ENC_ACTION(C_ISO_8859_6)},
- {N_("/_Options/Character _encoding/Arabic/Windows-1256"),
- ENC_ACTION(C_CP1256)},
-
- {N_("/_Options/Character _encoding/Turkish (ISO-8859-_9)"),
- ENC_ACTION(C_ISO_8859_9)},
-
- {N_("/_Options/Character _encoding/Cyrillic"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Character _encoding/Cyrillic/ISO-8859-_5"),
- ENC_ACTION(C_ISO_8859_5)},
- {N_("/_Options/Character _encoding/Cyrillic/KOI8-_R"),
- ENC_ACTION(C_KOI8_R)},
- {N_("/_Options/Character _encoding/Cyrillic/KOI8-U"),
- ENC_ACTION(C_KOI8_U)},
- {N_("/_Options/Character _encoding/Cyrillic/Windows-1251"),
- ENC_ACTION(C_WINDOWS_1251)},
-
- {N_("/_Options/Character _encoding/Japanese"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Character _encoding/Japanese/ISO-2022-_JP"),
- ENC_ACTION(C_ISO_2022_JP)},
- {N_("/_Options/Character _encoding/Japanese/ISO-2022-JP-2"),
- ENC_ACTION(C_ISO_2022_JP_2)},
- {N_("/_Options/Character _encoding/Japanese/_EUC-JP"),
- ENC_ACTION(C_EUC_JP)},
- {N_("/_Options/Character _encoding/Japanese/_Shift__JIS"),
- ENC_ACTION(C_SHIFT_JIS)},
-
- {N_("/_Options/Character _encoding/Chinese"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Character _encoding/Chinese/Simplified (_GB2312)"),
- ENC_ACTION(C_GB2312)},
- {N_("/_Options/Character _encoding/Chinese/Simplified (GBK)"),
- ENC_ACTION(C_GBK)},
- {N_("/_Options/Character _encoding/Chinese/Traditional (_Big5)"),
- ENC_ACTION(C_BIG5)},
- {N_("/_Options/Character _encoding/Chinese/Traditional (EUC-_TW)"),
- ENC_ACTION(C_EUC_TW)},
-
- {N_("/_Options/Character _encoding/Korean"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Character _encoding/Korean/EUC-_KR"),
- ENC_ACTION(C_EUC_KR)},
- {N_("/_Options/Character _encoding/Korean/ISO-2022-KR"),
- ENC_ACTION(C_ISO_2022_KR)},
-
- {N_("/_Options/Character _encoding/Thai"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Options/Character _encoding/Thai/TIS-620"),
- ENC_ACTION(C_TIS_620)},
- {N_("/_Options/Character _encoding/Thai/Windows-874"),
- ENC_ACTION(C_WINDOWS_874)},
-
- {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},
- {N_("/_Tools/_Template"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Help"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Help/_About"), NULL, about_show, 0, NULL}
+ {"Options", NULL, N_("_Options") },
+ {"Tools", NULL, N_("_Tools") },
+ {"Help", NULL, N_("_Help") },
+/* Message menu */
+ {"Message/Send", NULL, N_("S_end"), "<control>Return", NULL, G_CALLBACK(compose_send_cb) },
+ {"Message/SendLater", NULL, N_("Send _later"), "<shift><control>S", NULL, G_CALLBACK(compose_send_later_cb) },
+ {"Message/---", NULL, "---" },
+
+ {"Message/AttachFile", NULL, N_("_Attach file"), "<control>M", NULL, G_CALLBACK(compose_attach_cb) },
+ {"Message/InsertFile", NULL, N_("_Insert file"), "<control>I", NULL, G_CALLBACK(compose_insert_file_cb) },
+ {"Message/InsertSig", NULL, N_("Insert si_gnature"), "<control>G", NULL, G_CALLBACK(compose_insert_sig_cb) },
+ /* {"Message/---", NULL, "---" }, */
+ {"Message/Save", NULL, N_("_Save"), "<control>S", NULL, G_CALLBACK(compose_save_cb) }, /*COMPOSE_KEEP_EDITING*/
+ /* {"Message/---", NULL, "---" }, */
+ {"Message/Close", NULL, N_("_Close"), "<control>W", NULL, G_CALLBACK(compose_close_cb) },
+
+/* Edit menu */
+ {"Edit/Undo", NULL, N_("_Undo"), "<control>Z", NULL, G_CALLBACK(compose_undo_cb) },
+ {"Edit/Redo", NULL, N_("_Redo"), "<control>Y", NULL, G_CALLBACK(compose_redo_cb) },
+ {"Edit/---", NULL, "---" },
+
+ {"Edit/Cut", NULL, N_("Cu_t"), "<control>X", NULL, G_CALLBACK(compose_cut_cb) },
+ {"Edit/Copy", NULL, N_("_Copy"), "<control>C", NULL, G_CALLBACK(compose_copy_cb) },
+ {"Edit/Paste", NULL, N_("_Paste"), "<control>V", NULL, G_CALLBACK(compose_paste_cb) },
+
+ {"Edit/SpecialPaste", NULL, N_("Special paste") },
+ {"Edit/SpecialPaste/AsQuotation", NULL, N_("as _quotation"), NULL, NULL, G_CALLBACK(compose_paste_as_quote_cb) },
+ {"Edit/SpecialPaste/Wrapped", NULL, N_("_wrapped"), NULL, NULL, G_CALLBACK(compose_paste_wrap_cb) },
+ {"Edit/SpecialPaste/Unwrapped", NULL, N_("_unwrapped"), NULL, NULL, G_CALLBACK(compose_paste_no_wrap_cb) },
+
+ {"Edit/SelectAll", NULL, N_("Select _all"), "<control>A", NULL, G_CALLBACK(compose_allsel_cb) },
+
+ {"Edit/Advanced", NULL, N_("A_dvanced") },
+ {"Edit/Advanced/BackChar", NULL, N_("Move a character backward"), "<shift><control>B", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER*/
+ {"Edit/Advanced/ForwChar", NULL, N_("Move a character forward"), "<shift><control>F", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER*/
+ {"Edit/Advanced/BackWord", NULL, N_("Move a word backward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_WORD*/
+ {"Edit/Advanced/ForwWord", NULL, N_("Move a word forward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_WORD*/
+ {"Edit/Advanced/BegLine", NULL, N_("Move to beginning of line"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE*/
+ {"Edit/Advanced/EndLine", NULL, N_("Move to end of line"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_END_OF_LINE*/
+ {"Edit/Advanced/PrevLine", NULL, N_("Move to previous line"), "<control>P", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_PREVIOUS_LINE*/
+ {"Edit/Advanced/NextLine", NULL, N_("Move to next line"), "<control>N", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_MOVE_NEXT_LINE*/
+ {"Edit/Advanced/DelBackChar", NULL, N_("Delete a character backward"), "<control>H", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_CHARACTER*/
+ {"Edit/Advanced/DelForwChar", NULL, N_("Delete a character forward"), "<control>D", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_CHARACTER*/
+ {"Edit/Advanced/DelBackWord", NULL, N_("Delete a word backward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD*/
+ {"Edit/Advanced/DelForwWord", NULL, N_("Delete a word forward"), NULL, NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD*/
+ {"Edit/Advanced/DelLine", NULL, N_("Delete line"), "<control>U", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE*/
+ {"Edit/Advanced/DelEndLine", NULL, N_("Delete to end of line"), "<control>K", NULL, G_CALLBACK(compose_advanced_action_cb) }, /*COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END*/
+
+ /* {"Edit/---", NULL, "---" }, */
+ {"Edit/Find", NULL, N_("_Find"), "<control>F", NULL, G_CALLBACK(compose_find_cb) },
+
+ /* {"Edit/---", NULL, "---" }, */
+ {"Edit/WrapPara", NULL, N_("_Wrap current paragraph"), "<control>L", NULL, G_CALLBACK(compose_wrap_cb) }, /* 0 */
+ {"Edit/WrapAllLines", NULL, N_("Wrap all long _lines"), "<control><alt>L", NULL, G_CALLBACK(compose_wrap_all_cb) }, /* 1 */
+ /* {"Edit/---", NULL, "---" }, */
+ {"Edit/ExtEditor", NULL, N_("Edit with e_xternal editor"), "<shift><control>X", NULL, G_CALLBACK(compose_ext_editor_cb) },
+#if USE_ENCHANT
+/* Spelling menu */
+ {"Spelling/CheckAllSel", NULL, N_("_Check all or check selection"), NULL, NULL, G_CALLBACK(compose_check_all) },
+ {"Spelling/HighlightAll", NULL, N_("_Highlight all misspelled words"), NULL, NULL, G_CALLBACK(compose_highlight_all) },
+ {"Spelling/CheckBackwards", NULL, N_("Check _backwards misspelled word"), NULL, NULL, G_CALLBACK(compose_check_backwards) },
+ {"Spelling/ForwardNext", NULL, N_("_Forward to next misspelled word"), NULL, NULL, G_CALLBACK(compose_check_forwards_go) },
+
+ {"Spelling/---", NULL, "---" },
+ {"Spelling/Options", NULL, N_("_Options") },
+#endif
+
+/* Options menu */
+
+ {"Options/ReplyMode", NULL, N_("Reply _mode") },
+ {"Options/---", NULL, "---" },
+ {"Options/PrivacySystem", NULL, N_("Privacy _System") },
+ {"Options/PrivacySystem/PlaceHolder", NULL, "Placeholder", NULL, NULL, G_CALLBACK(compose_nothing_cb) },
+
+ /* {"Options/---", NULL, "---" }, */
+
+ {"Options/Priority", NULL, N_("_Priority") },
+
+ {"Options/Encoding", NULL, N_("Character _encoding") },
+ {"Options/Encoding/---", NULL, "---" },
+#define ENC_ACTION(cs_char,c_char,string) \
+ { "Options/Encoding/" cs_char, NULL, N_(string), NULL, NULL, c_char }
+
+ {"Options/Encoding/Western", NULL, N_("Western European") },
+ {"Options/Encoding/Baltic", NULL, N_("Baltic") },
+ {"Options/Encoding/Hebrew", NULL, N_("Hebrew") },
+ {"Options/Encoding/Arabic", NULL, N_("Arabic") },
+ {"Options/Encoding/Cyrillic", NULL, N_("Cyrillic") },
+ {"Options/Encoding/Japanese", NULL, N_("Japanese") },
+ {"Options/Encoding/Chinese", NULL, N_("Chinese") },
+ {"Options/Encoding/Korean", NULL, N_("Korean") },
+ {"Options/Encoding/Thai", NULL, N_("Thai") },
+
+/* Tools menu */
+ {"Tools/AddressBook", NULL, N_("_Address book"), NULL, NULL, G_CALLBACK(compose_address_cb) },
+
+ {"Tools/Template", NULL, N_("_Template") },
+ {"Tools/Template/PlaceHolder", NULL, "Placeholder", NULL, NULL, G_CALLBACK(compose_nothing_cb) },
+ {"Tools/Actions", NULL, N_("Actio_ns") },
+ {"Tools/Actions/PlaceHolder", NULL, "Placeholder", NULL, NULL, G_CALLBACK(compose_nothing_cb) },
+
+/* Help menu */
+ {"Help/About", NULL, N_("_About"), NULL, NULL, G_CALLBACK(about_show_cb) },
+};
+
+static GtkToggleActionEntry compose_toggle_entries[] =
+{
+ {"Edit/AutoWrap", NULL, N_("Aut_o wrapping"), "<shift><control>L", NULL, G_CALLBACK(compose_toggle_autowrap_cb) }, /* TOGGLE */
+ {"Edit/AutoIndent", NULL, N_("Auto _indent"), NULL, NULL, G_CALLBACK(compose_toggle_autoindent_cb) }, /* TOGGLE */
+ {"Options/Sign", NULL, N_("Si_gn"), NULL, NULL, G_CALLBACK(compose_toggle_sign_cb) }, /* Toggle */
+ {"Options/Encrypt", NULL, N_("_Encrypt"), NULL, NULL, G_CALLBACK(compose_toggle_encrypt_cb) }, /* Toggle */
+ {"Options/RequestRetRcpt", NULL, N_("_Request Return Receipt"), NULL, NULL, G_CALLBACK(compose_toggle_return_receipt_cb) }, /* TOGGLE */
+ {"Options/RemoveReferences", NULL, N_("Remo_ve references"), NULL, NULL, G_CALLBACK(compose_toggle_remove_refs_cb) }, /* TOGGLE */
+ {"Tools/ShowRuler", NULL, N_("Show _ruler"), NULL, NULL, G_CALLBACK(compose_toggle_ruler_cb) }, /* Toggle */
+};
+
+static GtkRadioActionEntry compose_radio_rm_entries[] =
+{
+ {"Options/ReplyMode/Normal", NULL, N_("_Normal"), NULL, NULL, COMPOSE_REPLY }, /* RADIO compose_reply_change_mode_cb */
+ {"Options/ReplyMode/All", NULL, N_("_All"), NULL, NULL, COMPOSE_REPLY_TO_ALL }, /* RADIO compose_reply_change_mode_cb */
+ {"Options/ReplyMode/Sender", NULL, N_("_Sender"), NULL, NULL, COMPOSE_REPLY_TO_SENDER }, /* RADIO compose_reply_change_mode_cb */
+ {"Options/ReplyMode/List", NULL, N_("_Mailing-list"), NULL, NULL, COMPOSE_REPLY_TO_LIST }, /* RADIO compose_reply_change_mode_cb */
+};
+
+static GtkRadioActionEntry compose_radio_prio_entries[] =
+{
+ {"Options/Priority/Highest", NULL, N_("_Highest"), NULL, NULL, PRIORITY_HIGHEST }, /* RADIO compose_set_priority_cb */
+ {"Options/Priority/High", NULL, N_("Hi_gh"), NULL, NULL, PRIORITY_HIGH }, /* RADIO compose_set_priority_cb */
+ {"Options/Priority/Normal", NULL, N_("_Normal"), NULL, NULL, PRIORITY_NORMAL }, /* RADIO compose_set_priority_cb */
+ {"Options/Priority/Low", NULL, N_("Lo_w"), NULL, NULL, PRIORITY_LOW }, /* RADIO compose_set_priority_cb */
+ {"Options/Priority/Lowest", NULL, N_("_Lowest"), NULL, NULL, PRIORITY_LOWEST }, /* RADIO compose_set_priority_cb */
+};
+
+static GtkRadioActionEntry compose_radio_enc_entries[] =
+{
+ ENC_ACTION(CS_AUTO, C_AUTO, N_("_Automatic")), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION(CS_US_ASCII, C_US_ASCII, N_("7bit ASCII (US-ASC_II)")), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION(CS_UTF_8, C_UTF_8, N_("Unicode (_UTF-8)")), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Western/"CS_ISO_8859_1, C_ISO_8859_1, "ISO-8859-_1"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Western/"CS_ISO_8859_15, C_ISO_8859_15, "ISO-8859-15"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Western/"CS_WINDOWS_1252, C_WINDOWS_1252, "Windows-1252"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION(CS_ISO_8859_2, C_ISO_8859_2, N_("Central European (ISO-8859-_2)")), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Baltic/"CS_ISO_8859_13, C_ISO_8859_13, "ISO-8859-13"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Baltic/"CS_ISO_8859_4, C_ISO_8859_14, "ISO-8859-_4"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION(CS_ISO_8859_7, C_ISO_8859_7, N_("Greek (ISO-8859-_7)")), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Hebrew/"CS_ISO_8859_8, C_ISO_8859_8, "ISO-8859-_8"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Hebrew/"CS_WINDOWS_1255, C_WINDOWS_1255, "Windows-1255"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Arabic/"CS_ISO_8859_6, C_ISO_8859_6, "ISO-8859-_6"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Arabic/"CS_WINDOWS_1256, C_WINDOWS_1256, "Windows-1256"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION(CS_ISO_8859_9, C_ISO_8859_9, N_("Turkish (ISO-8859-_9)")), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Cyrillic/"CS_ISO_8859_5, C_ISO_8859_5, "ISO-8859-_5"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Cyrillic/"CS_KOI8_R, C_KOI8_R, "KOI8-_R"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Cyrillic/"CS_KOI8_U, C_KOI8_U, "KOI8-_U"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Cyrillic/"CS_WINDOWS_1251, C_WINDOWS_1251, "Windows-1251"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Japanese/"CS_ISO_2022_JP, C_ISO_2022_JP, "ISO-2022-_JP"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Japanese/"CS_ISO_2022_JP_2, C_ISO_2022_JP_2, "ISO-2022-JP-_2"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Japanese/"CS_EUC_JP, C_EUC_JP, "_EUC-JP"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Japanese/"CS_SHIFT_JIS, C_SHIFT_JIS, "_Shift-JIS"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Chinese/"CS_GB2312, C_GB2312, "_GB2312"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Chinese/"CS_GBK, C_GBK, "GB_K"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Chinese/"CS_BIG5, C_BIG5, "_Big5-JP"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Chinese/"CS_EUC_TW, C_EUC_TW, "EUC-_TW"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Korean/"CS_EUC_KR, C_EUC_KR, "_EUC-KR"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Korean/"CS_ISO_2022_KR, C_ISO_2022_KR, "_ISO-2022-KR"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Thai/"CS_TIS_620, C_TIS_620, "_TIS-620-KR"), /* RADIO compose_set_encoding_cb */
+ ENC_ACTION("Thai/"CS_WINDOWS_874, C_WINDOWS_874, "_Windows-874"), /* RADIO compose_set_encoding_cb */
};
static GtkTargetEntry compose_mime_types[] =
GtkTextView *textview;
GtkTextBuffer *textbuf;
GtkTextIter iter;
- GtkItemFactory *ifactory;
const gchar *subject_format = NULL;
const gchar *body_format = NULL;
+ gchar *mailto_from = NULL;
+ PrefsAccount *mailto_account = NULL;
+ MsgInfo* dummyinfo = NULL;
+
+ /* check if mailto defines a from */
+ if (mailto && *mailto != '\0') {
+ scan_mailto_url(mailto, &mailto_from, NULL, NULL, NULL, NULL, NULL, NULL);
+ /* mailto defines a from, check if we can get account prefs from it,
+ if not, the account prefs will be guessed using other ways, but we'll keep
+ the from anyway */
+ if (mailto_from)
+ mailto_account = account_find_from_address(mailto_from, TRUE);
+ if (mailto_account)
+ account = mailto_account;
+ }
- if (item && item->prefs && item->prefs->enable_default_account)
+ /* if no account prefs set from mailto, set if from folder prefs (if any) */
+ if (!mailto_account && item && item->prefs && item->prefs->enable_default_account)
account = account_find_from_id(item->prefs->default_account);
+ /* if no account prefs set, fallback to the current one */
if (!account) account = cur_account;
g_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, item, COMPOSE_NEW, FALSE);
- ifactory = gtk_item_factory_from_widget(compose->menubar);
+ /* override from name if mailto asked for it */
+ if (mailto_from) {
+ gtk_entry_set_text(GTK_ENTRY(compose->from_name), mailto_from);
+ g_free(mailto_from);
+ } else
+ /* override from name according to folder properties */
+ if (item && item->prefs &&
+ item->prefs->compose_with_format &&
+ item->prefs->compose_override_from_format &&
+ *item->prefs->compose_override_from_format != '\0') {
+
+ gchar *tmp = NULL;
+ gchar *buf = NULL;
+
+ dummyinfo = compose_msginfo_new_from_compose(compose);
+
+ /* decode \-escape sequences in the internal representation of the quote format */
+ tmp = malloc(strlen(item->prefs->compose_override_from_format)+1);
+ pref_get_unescaped_pref(tmp, item->prefs->compose_override_from_format);
+
+#ifdef USE_ENCHANT
+ quote_fmt_init(dummyinfo, NULL, NULL, FALSE, compose->account, FALSE,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(dummyinfo, NULL, NULL, FALSE, compose->account, FALSE);
+#endif
+ quote_fmt_scan_string(tmp);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL)
+ alertpanel_error(_("New message From format error."));
+ else
+ gtk_entry_set_text(GTK_ENTRY(compose->from_name), buf);
+ quote_fmt_reset_vartable();
+
+ g_free(tmp);
+ }
compose->replyinfo = NULL;
compose->fwdinfo = NULL;
compose_create_tags(textview, compose);
undo_block(compose->undostruct);
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
compose_set_dictionaries_from_folder_prefs(compose, item);
#endif
if (account->protocol != A_NNTP) {
if (mailto && *mailto != '\0') {
- compose_entries_set(compose, mailto);
+ compose_entries_set(compose, mailto, COMPOSE_TO);
} else if (item && item->prefs->enable_default_to) {
compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
compose_entry_mark_default_to(compose, item->prefs->default_to);
}
if (item && item->ret_rcpt) {
- menu_set_active(ifactory, "/Options/Request Return Receipt", TRUE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/RequestRetRcpt", TRUE);
}
} else {
- if (mailto) {
- compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
+ if (mailto && *mailto != '\0') {
+ if (!strchr(mailto, '@'))
+ compose_entries_set(compose, mailto, COMPOSE_NEWSGROUPS);
+ else
+ compose_entries_set(compose, mailto, COMPOSE_TO);
} else if (item && FOLDER_CLASS(item->folder) == news_get_class()) {
compose_entry_append(compose, item->path, COMPOSE_NEWSGROUPS);
}
* CLAWS: just don't allow return receipt request, even if the user
* may want to send an email. simple but foolproof.
*/
- menu_set_sensitive(ifactory, "/Options/Request Return Receipt", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/RequestRetRcpt", FALSE);
}
compose_add_field_list( compose, listAddress );
}
if (subject_format || body_format) {
- MsgInfo* dummyinfo = NULL;
if ( subject_format
&& *subject_format != '\0' )
gchar *tmp = NULL;
gchar *buf = NULL;
- dummyinfo = compose_msginfo_new_from_compose(compose);
+ if (!dummyinfo)
+ dummyinfo = compose_msginfo_new_from_compose(compose);
/* decode \-escape sequences in the internal representation of the quote format */
tmp = malloc(strlen(subject_format)+1);
pref_get_unescaped_pref(tmp, subject_format);
subject = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
-#ifdef USE_ASPELL
- quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account,
+#ifdef USE_ENCHANT
+ quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account, FALSE,
compose->gtkaspell);
#else
- quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account);
+ quote_fmt_init(dummyinfo, NULL, subject, FALSE, compose->account, FALSE);
#endif
quote_fmt_scan_string(tmp);
quote_fmt_parse();
GtkTextIter start, end;
gchar *tmp = NULL;
- if ( dummyinfo == NULL )
+ if (!dummyinfo)
dummyinfo = compose_msginfo_new_from_compose(compose);
text = GTK_TEXT_VIEW(compose->text);
g_free(tmp);
}
- procmsg_msginfo_free( dummyinfo );
}
+ procmsg_msginfo_free( dummyinfo );
if (attach_files) {
gint i;
if (privacy != NULL) {
if (compose->privacy_system == NULL)
compose->privacy_system = g_strdup(privacy);
+ else if (*(compose->privacy_system) == '\0') {
+ g_free(compose->privacy_system);
+ compose->privacy_system = g_strdup(privacy);
+ }
compose_update_privacy_system_menu_item(compose, FALSE);
compose_use_encryption(compose, TRUE);
}
MsgInfo *msginfo;
guint list_len;
Compose *compose = NULL;
- GtkItemFactory *ifactory = NULL;
g_return_val_if_fail(msginfo_list != NULL, NULL);
alertpanel_error(_("Unable to reply. The original email probably doesn't exist."));
return NULL;
}
- ifactory = gtk_item_factory_from_widget(compose->menubar);
compose->rmode = mode;
switch (compose->rmode) {
case COMPOSE_REPLY_WITHOUT_QUOTE:
case COMPOSE_FOLLOWUP_AND_REPLY_TO:
debug_print("reply mode Normal\n");
- menu_set_active(ifactory, "/Options/Reply mode/Normal", TRUE);
- compose_reply_change_mode(compose, COMPOSE_REPLY, NULL); /* force update */
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/ReplyMode/Normal", TRUE);
+ compose_reply_change_mode(compose, COMPOSE_REPLY); /* force update */
break;
case COMPOSE_REPLY_TO_SENDER:
case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
debug_print("reply mode Sender\n");
- menu_set_active(ifactory, "/Options/Reply mode/Sender", TRUE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/ReplyMode/Sender", TRUE);
break;
case COMPOSE_REPLY_TO_ALL:
case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
debug_print("reply mode All\n");
- menu_set_active(ifactory, "/Options/Reply mode/All", TRUE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/ReplyMode/All", TRUE);
break;
case COMPOSE_REPLY_TO_LIST:
case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
debug_print("reply mode List\n");
- menu_set_active(ifactory, "/Options/Reply mode/Mailing-list", TRUE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/ReplyMode/List", TRUE);
break;
default:
break;
gboolean followup_and_reply_to,
const gchar *body)
{
- GtkItemFactory *ifactory;
Compose *compose;
PrefsAccount *account = NULL;
GtkTextView *textview;
compose->updating = TRUE;
- ifactory = gtk_item_factory_from_widget(compose->menubar);
-
- menu_set_active(ifactory, "/Options/Remove references", FALSE);
- menu_set_sensitive(ifactory, "/Options/Remove references", TRUE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/RemoveReferences", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/RemoveReferences", TRUE);
compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
if (!compose->replyinfo)
compose_extract_original_charset(compose);
if (msginfo->folder && msginfo->folder->ret_rcpt)
- menu_set_active(ifactory, "/Options/Request Return Receipt", TRUE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/RequestRetRcpt", TRUE);
/* Set save folder */
if (msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
g_free(folderidentifier);
}
- if (compose_parse_header(compose, msginfo) < 0) return NULL;
+ if (compose_parse_header(compose, msginfo) < 0) {
+ compose->updating = FALSE;
+ compose_destroy(compose);
+ return NULL;
+ }
+
+ /* override from name according to folder properties */
+ if (msginfo->folder && msginfo->folder->prefs &&
+ msginfo->folder->prefs->reply_with_format &&
+ msginfo->folder->prefs->reply_override_from_format &&
+ *msginfo->folder->prefs->reply_override_from_format != '\0') {
+
+ gchar *tmp = NULL;
+ gchar *buf = NULL;
+
+ /* decode \-escape sequences in the internal representation of the quote format */
+ tmp = malloc(strlen(msginfo->folder->prefs->reply_override_from_format)+1);
+ pref_get_unescaped_pref(tmp, msginfo->folder->prefs->reply_override_from_format);
+
+#ifdef USE_ENCHANT
+ quote_fmt_init(compose->replyinfo, NULL, NULL, FALSE, compose->account, FALSE,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(compose->replyinfo, NULL, NULL, FALSE, compose->account, FALSE);
+#endif
+ quote_fmt_scan_string(tmp);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL)
+ alertpanel_error(_("Message reply From format error."));
+ else
+ gtk_entry_set_text(GTK_ENTRY(compose->from_name), buf);
+ quote_fmt_reset_vartable();
+
+ g_free(tmp);
+ }
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
+#ifdef USE_ENCHANT
compose_set_dictionaries_from_folder_prefs(compose, msginfo->folder);
#endif
} else {
qmark = prefs_common.quotemark;
- body_fmt = prefs_common.quotefmt;
+ if (prefs_common.quotefmt && *prefs_common.quotefmt)
+ body_fmt = gettext(prefs_common.quotefmt);
+ else
+ body_fmt = "";
}
}
compose_force_encryption(compose, account, FALSE);
}
+ privacy_msginfo_get_signed_state(compose->replyinfo);
+ if (MSG_IS_SIGNED(compose->replyinfo->flags) && account->default_sign_reply) {
+ compose_force_signing(compose, account);
+ }
+
SIGNAL_BLOCK(textbuf);
if (account->auto_sig)
g_free(buf2);
}
+ /* override from name according to folder properties */
+ if (msginfo->folder && msginfo->folder->prefs &&
+ msginfo->folder->prefs->forward_with_format &&
+ msginfo->folder->prefs->forward_override_from_format &&
+ *msginfo->folder->prefs->forward_override_from_format != '\0') {
+
+ gchar *tmp = NULL;
+ gchar *buf = NULL;
+ MsgInfo *full_msginfo = NULL;
+
+ if (!as_attach)
+ full_msginfo = procmsg_msginfo_get_full_info(msginfo);
+ if (!full_msginfo)
+ full_msginfo = procmsg_msginfo_copy(msginfo);
+
+ /* decode \-escape sequences in the internal representation of the quote format */
+ tmp = malloc(strlen(msginfo->folder->prefs->forward_override_from_format)+1);
+ pref_get_unescaped_pref(tmp, msginfo->folder->prefs->forward_override_from_format);
+
+#ifdef USE_ENCHANT
+ quote_fmt_init(full_msginfo, NULL, NULL, FALSE, compose->account, FALSE,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(full_msginfo, NULL, NULL, FALSE, compose->account, FALSE);
+#endif
+ quote_fmt_scan_string(tmp);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL)
+ alertpanel_error(_("Message forward From format error."));
+ else
+ gtk_entry_set_text(GTK_ENTRY(compose->from_name), buf);
+ quote_fmt_reset_vartable();
+
+ g_free(tmp);
+ procmsg_msginfo_free(full_msginfo);
+ }
+
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
compose_create_tags(textview, compose);
g_free(msgfile);
} else {
const gchar *qmark = NULL;
- const gchar *body_fmt = prefs_common.fw_quotefmt;
+ const gchar *body_fmt = NULL;
MsgInfo *full_msginfo;
+ if (prefs_common.fw_quotefmt && *prefs_common.fw_quotefmt)
+ body_fmt = gettext(prefs_common.fw_quotefmt);
+ else
+ body_fmt = "";
+
full_msginfo = procmsg_msginfo_get_full_info(msginfo);
if (!full_msginfo)
full_msginfo = procmsg_msginfo_copy(msginfo);
} else {
qmark = prefs_common.fw_quotemark;
- body_fmt = prefs_common.fw_quotefmt;
+ if (prefs_common.fw_quotefmt && *prefs_common.fw_quotefmt)
+ body_fmt = gettext(prefs_common.fw_quotefmt);
+ else
+ body_fmt = "";
}
/* empty quotemark is not allowed */
compose->updating = TRUE;
+ /* override from name according to folder properties */
+ if (msginfo_list->data) {
+ MsgInfo *msginfo = msginfo_list->data;
+
+ if (msginfo->folder && msginfo->folder->prefs &&
+ msginfo->folder->prefs->forward_with_format &&
+ msginfo->folder->prefs->forward_override_from_format &&
+ *msginfo->folder->prefs->forward_override_from_format != '\0') {
+
+ gchar *tmp = NULL;
+ gchar *buf = NULL;
+
+ /* decode \-escape sequences in the internal representation of the quote format */
+ tmp = malloc(strlen(msginfo->folder->prefs->forward_override_from_format)+1);
+ pref_get_unescaped_pref(tmp, msginfo->folder->prefs->forward_override_from_format);
+
+#ifdef USE_ENCHANT
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE);
+#endif
+ quote_fmt_scan_string(tmp);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL)
+ alertpanel_error(_("Message forward From format error."));
+ else
+ gtk_entry_set_text(GTK_ENTRY(compose->from_name), buf);
+ quote_fmt_reset_vartable();
+
+ g_free(tmp);
+ }
+ }
+
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
compose_create_tags(textview, compose);
gchar *privacy_system = NULL;
int priority = PRIORITY_NORMAL;
MsgInfo *replyinfo = NULL, *fwdinfo = NULL;
+ gboolean autowrap = prefs_common.autowrap;
+ gboolean autoindent = prefs_common.auto_indent;
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
}
if (!account && !procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "S:")) {
- account = account_find_from_address(queueheader_buf);
+ account = account_find_from_address(queueheader_buf, FALSE);
}
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Claws-Sign:")) {
param = atoi(&queueheader_buf[strlen("X-Sylpheed-Encrypt:")]);
use_encryption = param;
}
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Claws-Auto-Wrapping:")) {
+ param = atoi(&queueheader_buf[strlen("X-Claws-Auto-Wrapping:")]);
+ autowrap = param;
+ }
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "X-Claws-Auto-Indent:")) {
+ param = atoi(&queueheader_buf[strlen("X-Claws-Auto-Indent:")]);
+ autoindent = param;
+ }
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Claws-Privacy-System:")) {
privacy_system = g_strdup(&queueheader_buf[strlen("X-Claws-Privacy-System:")]);
gchar from[BUFFSIZE];
if (!procheader_get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")) {
extract_address(from);
- account = account_find_from_address(from);
+ account = account_find_from_address(from, FALSE);
}
}
if (!account) {
g_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, msginfo->folder, COMPOSE_REEDIT, batch);
-
+
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Edit/AutoWrap", autowrap);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Edit/AutoIndent", autoindent);
+ compose->autowrap = autowrap;
compose->replyinfo = replyinfo;
compose->fwdinfo = fwdinfo;
if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf, sizeof(queueheader_buf), "RRCPT:")) {
gint active = atoi(&queueheader_buf[strlen("RRCPT:")]);
if (active) {
- GtkItemFactory *ifactory;
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_active(ifactory, "/Options/Request Return Receipt", TRUE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/RequestRetRcpt", TRUE);
}
}
}
return NULL;
}
- compose->sig_str = compose_get_signature_str(compose);
+ compose->sig_str = account_get_signature_str(compose->account);
return compose;
}
{
Compose *compose;
gchar *filename;
- GtkItemFactory *ifactory;
FolderItem *item;
g_return_val_if_fail(msginfo != NULL, NULL);
compose->updating = TRUE;
- ifactory = gtk_item_factory_from_widget(compose->menubar);
compose_create_tags(GTK_TEXT_VIEW(compose->text), compose);
compose->replyinfo = NULL;
compose->fwdinfo = NULL;
compose_colorize_signature(compose);
- ifactory = gtk_item_factory_from_widget(compose->popupmenu);
- menu_set_sensitive(ifactory, "/Add...", FALSE);
- menu_set_sensitive(ifactory, "/Remove", FALSE);
- menu_set_sensitive(ifactory, "/Properties...", FALSE);
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_sensitive(ifactory, "/Message/Save", FALSE);
- menu_set_sensitive(ifactory, "/Message/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, "/Options", FALSE);
- menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
- menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
+
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Add", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Remove", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", FALSE);
+
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/Save", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/InsertFile", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/AttachFile", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/InsertSig", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Tools/ShowRuler", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Tools/Actions", FALSE);
if (compose->toolbar->draft_btn)
gtk_widget_set_sensitive(compose->toolbar->draft_btn, FALSE);
switch(action) {
case A_SEND:
- compose_send_cb(compose, 0, NULL);
+ compose_send_cb(NULL, compose);
break;
case A_SENDL:
- compose_send_later_cb(compose, 0, NULL);
+ compose_send_later_cb(NULL, compose);
break;
case A_DRAFT:
- compose_draft_cb(compose, COMPOSE_QUIT_EDITING, NULL);
+ compose_draft(compose, COMPOSE_QUIT_EDITING);
break;
case A_INSERT:
- compose_insert_file_cb(compose, 0, NULL);
+ compose_insert_file_cb(NULL, compose);
break;
case A_ATTACH:
- compose_attach_cb(compose, 0, NULL);
+ compose_attach_cb(NULL, compose);
break;
case A_SIG:
compose_insert_sig(compose, FALSE);
break;
case A_EXTEDITOR:
- compose_ext_editor_cb(compose, 0, NULL);
+ compose_ext_editor_cb(NULL, compose);
break;
case A_LINEWRAP_CURRENT:
compose_beautify_paragraph(compose, NULL, TRUE);
compose_wrap_all_full(compose, TRUE);
break;
case A_ADDRBOOK:
- compose_address_cb(compose, 0, NULL);
+ compose_address_cb(NULL, compose);
break;
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
case A_CHECK_SPELLING:
- compose_check_all(compose);
+ compose_check_all(NULL, compose);
break;
#endif
default:
}
}
-static void compose_entries_set(Compose *compose, const gchar *mailto)
+static void compose_entries_set(Compose *compose, const gchar *mailto, ComposeEntryType to_type)
{
gchar *to = NULL;
gchar *cc = NULL;
gchar *temp = NULL;
gsize len = 0;
gchar **attach = NULL;
-
- scan_mailto_url(mailto, &to, &cc, &bcc, &subject, &body, &attach);
+
+ /* get mailto parts but skip from */
+ scan_mailto_url(mailto, NULL, &to, &cc, &bcc, &subject, &body, &attach);
if (to)
- compose_entry_append(compose, to, COMPOSE_TO);
+ compose_entry_append(compose, to, to_type);
if (cc)
compose_entry_append(compose, cc, COMPOSE_CC);
if (bcc)
}
if (attach) {
- gint i = 0;
+ gint i = 0, att = 0;
+ gchar *warn_files = NULL;
while (attach[i] != NULL) {
gchar *utf8_filename = conv_filename_to_utf8(attach[i]);
if (utf8_filename) {
if (compose_attach_append(compose, attach[i], utf8_filename, NULL)) {
- alertpanel_notice(_("The file '%s' has been attached."), utf8_filename);
- }
+ gchar *tmp = g_strdup_printf("%s%s\n",
+ warn_files?warn_files:"",
+ utf8_filename);
+ g_free(warn_files);
+ warn_files = tmp;
+ att++;
+ }
g_free(utf8_filename);
} else {
alertpanel_error(_("Couldn't attach a file (charset conversion failed)."));
}
i++;
}
+ if (warn_files) {
+ alertpanel_notice(ngettext(
+ "The following file has been attached: \n%s",
+ "The following files have been attached: \n%s", att), warn_files);
+ g_free(warn_files);
+ }
}
g_free(to);
g_free(cc);
extract_address(hentry[H_LIST_POST].body);
if (hentry[H_LIST_POST].body[0] != '\0') {
scan_mailto_url(hentry[H_LIST_POST].body,
- &to, NULL, NULL, NULL, NULL, NULL);
+ NULL, &to, NULL, NULL, NULL, NULL, NULL);
if (to) {
g_free(compose->ml_post);
compose->ml_post = to;
}
if (qmark != NULL) {
-#ifdef USE_ASPELL
- quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+#ifdef USE_ENCHANT
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE,
compose->gtkaspell);
#else
- quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE);
#endif
quote_fmt_scan_string(qmark);
quote_fmt_parse();
while (*trimmed_body == '\n')
trimmed_body++;
-#ifdef USE_ASPELL
- quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account,
+#ifdef USE_ENCHANT
+ quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account, FALSE,
compose->gtkaspell);
#else
- quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account);
+ quote_fmt_init(msginfo, quote_str, trimmed_body, FALSE, compose->account, FALSE);
#endif
if (need_unescape) {
gchar *tmp = NULL;
}
cursor_pos = quote_fmt_get_cursor_pos();
+ if (cursor_pos == -1)
+ cursor_pos = gtk_text_iter_get_offset(&iter);
compose->set_cursor_pos = cursor_pos;
- if (cursor_pos == -1) {
- cursor_pos = 0;
- }
+
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);
Xstrdup_a(tmp1, msginfo->from, return);
extract_address(tmp1);
if (to_all || to_sender ||
- !account_find_from_address(tmp1))
+ !account_find_from_address(tmp1, FALSE))
compose_entry_append(compose,
(compose->replyto && !to_sender)
? compose->replyto :
if (!folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
!folder_has_parent_of_type(msginfo->folder, F_OUTBOX) &&
!folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
- compose_entry_append(compose,
- msginfo->from ? msginfo->from : "",
- COMPOSE_TO);
+ if (compose->replyto) {
+ compose_entry_append(compose,
+ compose->replyto,
+ COMPOSE_TO);
+ } else {
+ compose_entry_append(compose,
+ msginfo->from ? msginfo->from : "",
+ COMPOSE_TO);
+ }
} else {
/* replying to own mail, use original recp */
compose_entry_append(compose,
GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
GtkTextMark *mark;
GtkTextIter iter, iter_end;
- gint cur_pos;
+ gint cur_pos, ins_pos;
gboolean prev_autowrap;
gboolean found = FALSE;
gboolean exists = FALSE;
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);
+ ins_pos = cur_pos;
gtk_text_buffer_get_end_iter(buffer, &iter);
if (found) {
/* include previous \n\n */
- gtk_text_iter_backward_chars(&first_iter, 2);
+ gtk_text_iter_backward_chars(&first_iter, 1);
start_iter = first_iter;
end_iter = first_iter;
/* skip re-start */
}
g_free(compose->sig_str);
- compose->sig_str = compose_get_signature_str(compose);
+ compose->sig_str = account_get_signature_str(compose->account);
cur_pos = gtk_text_iter_get_offset(&iter);
g_free(compose->sig_str);
compose->sig_str = NULL;
} else {
+ if (compose->sig_inserted == FALSE)
+ gtk_text_buffer_insert(buffer, &iter, "\n", -1);
+ compose->sig_inserted = TRUE;
+
+ cur_pos = gtk_text_iter_get_offset(&iter);
gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
/* remove \n\n */
gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
- gtk_text_iter_forward_chars(&iter, 2);
+ gtk_text_iter_forward_chars(&iter, 1);
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);
}
+
/* put the cursor where it should be
- * either where the quote_fmt says, either before the signature */
+ * either where the quote_fmt says, either where it was */
if (compose->set_cursor_pos < 0)
- gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
+ gtk_text_buffer_get_iter_at_offset(buffer, &iter, ins_pos);
else
gtk_text_buffer_get_iter_at_offset(buffer, &iter,
compose->set_cursor_pos);
-
+
+ compose->set_cursor_pos = -1;
gtk_text_buffer_place_cursor(buffer, &iter);
g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
G_CALLBACK(compose_changed_cb),
UNBLOCK_WRAP();
}
-static gchar *compose_get_signature_str(Compose *compose)
-{
- gchar *sig_body = NULL;
- gchar *sig_str = NULL;
- gchar *utf8_sig_str = NULL;
-
- g_return_val_if_fail(compose->account != NULL, NULL);
-
- if (!compose->account->sig_path)
- return NULL;
-
- if (compose->account->sig_type == SIG_FILE) {
- if (!is_file_or_fifo_exist(compose->account->sig_path)) {
- g_warning("can't open signature file: %s\n",
- compose->account->sig_path);
- return NULL;
- }
- }
-
- if (compose->account->sig_type == SIG_COMMAND)
- sig_body = get_command_output(compose->account->sig_path);
- else {
- gchar *tmp;
-
- tmp = file_read_to_str(compose->account->sig_path);
- if (!tmp)
- return NULL;
- sig_body = normalize_newlines(tmp);
- g_free(tmp);
- }
-
- if (compose->account->sig_sep) {
- sig_str = g_strconcat("\n\n", compose->account->sig_sep, "\n", sig_body,
- NULL);
- g_free(sig_body);
- } else
- sig_str = g_strconcat("\n\n", sig_body, NULL);
-
- if (sig_str) {
- 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_no_utf8(),
- CS_INTERNAL);
- g_free(sig_str);
- }
- }
-
- return utf8_sig_str;
-}
-
static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *file)
{
GtkTextView *text;
ainfo->content_type = g_strdup("application/octet-stream");
}
- ainfo->size = size;
- size_text = to_human_readable(size);
+ ainfo->size = (goffset)size;
+ size_text = to_human_readable((goffset)size);
store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(compose->attach_clist)));
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);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/Sign", 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);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/Encrypt", use_encryption);
}
#define NEXT_PART_NOT_CHILD(info) \
return NULL;
}
-/* return TRUE if the line is itemized */
-static gboolean compose_is_itemized(GtkTextBuffer *buffer,
+/* return >0 if the line is itemized */
+static int compose_itemized_length(GtkTextBuffer *buffer,
const GtkTextIter *start)
{
GtkTextIter iter = *start;
gunichar wc;
gchar ch[6];
gint clen;
-
+ gint len = 0;
if (gtk_text_iter_ends_line(&iter))
- return FALSE;
+ return 0;
while (1) {
+ len++;
wc = gtk_text_iter_get_char(&iter);
if (!g_unichar_isspace(wc))
break;
gtk_text_iter_forward_char(&iter);
if (gtk_text_iter_ends_line(&iter))
- return FALSE;
+ return 0;
}
clen = g_unichar_to_utf8(wc, ch);
if (clen != 1)
- return FALSE;
+ return 0;
if (!strchr("*-+", ch[0]))
- return FALSE;
+ return 0;
+
+ gtk_text_iter_forward_char(&iter);
+ if (gtk_text_iter_ends_line(&iter))
+ return 0;
+ wc = gtk_text_iter_get_char(&iter);
+ if (g_unichar_isspace(wc)) {
+ return len+1;
+ }
+ return 0;
+}
+
+/* return the string at the start of the itemization */
+static gchar * compose_get_itemized_chars(GtkTextBuffer *buffer,
+ const GtkTextIter *start)
+{
+ GtkTextIter iter = *start;
+ gunichar wc;
+ gint len = 0;
+ GString *item_chars = g_string_new("");
+ gchar *str = NULL;
+
+ if (gtk_text_iter_ends_line(&iter))
+ return NULL;
+
+ while (1) {
+ len++;
+ wc = gtk_text_iter_get_char(&iter);
+ if (!g_unichar_isspace(wc))
+ break;
+ gtk_text_iter_forward_char(&iter);
+ if (gtk_text_iter_ends_line(&iter))
+ break;
+ g_string_append_unichar(item_chars, wc);
+ }
+
+ str = item_chars->str;
+ g_string_free(item_chars, FALSE);
+ return str;
+}
+
+/* return the number of spaces at a line's start */
+static int compose_left_offset_length(GtkTextBuffer *buffer,
+ const GtkTextIter *start)
+{
+ GtkTextIter iter = *start;
+ gunichar wc;
+ gint len = 0;
+ if (gtk_text_iter_ends_line(&iter))
+ return 0;
+
+ while (1) {
+ wc = gtk_text_iter_get_char(&iter);
+ if (!g_unichar_isspace(wc))
+ break;
+ len++;
+ gtk_text_iter_forward_char(&iter);
+ if (gtk_text_iter_ends_line(&iter))
+ return 0;
+ }
gtk_text_iter_forward_char(&iter);
if (gtk_text_iter_ends_line(&iter))
- return FALSE;
- wc = gtk_text_iter_get_char(&iter);
- if (g_unichar_isspace(wc))
- return TRUE;
-
- return FALSE;
+ return 0;
+ return len;
}
static gboolean compose_get_line_break_pos(GtkTextBuffer *buffer,
gboolean keep_cursor = FALSE;
if (!gtk_text_iter_forward_line(&iter_) ||
- gtk_text_iter_ends_line(&iter_))
+ gtk_text_iter_ends_line(&iter_)) {
return FALSE;
-
+ }
next_quote_str = compose_get_quote_str(buffer, &iter_, "e_len);
if ((quote_str || next_quote_str) &&
end = iter_;
if (quote_len > 0) {
gtk_text_iter_forward_chars(&end, quote_len);
- if (gtk_text_iter_ends_line(&end))
+ if (gtk_text_iter_ends_line(&end)) {
return FALSE;
+ }
}
/* don't join itemized lines */
- if (compose_is_itemized(buffer, &end))
+ if (compose_itemized_length(buffer, &end) > 0) {
return FALSE;
+ }
/* don't join signature separator */
- if (compose_is_sig_separator(compose, buffer, &iter_))
+ if (compose_is_sig_separator(compose, buffer, &iter_)) {
return FALSE;
-
+ }
/* delete quote str */
if (quote_len > 0)
gtk_text_buffer_delete(buffer, &iter_, &end);
gboolean modified_before_remove = FALSE;
gint lines = 0;
gboolean start = TRUE;
+ gint itemized_len = 0, rem_item_len = 0;
+ gchar *itemized_chars = NULL;
+ gboolean item_continuation = FALSE;
if (force) {
modified = TRUE;
/* move to line start */
gtk_text_iter_set_line_offset(&iter, 0);
}
+
+ itemized_len = compose_itemized_length(buffer, &iter);
+
+ if (!itemized_len) {
+ itemized_len = compose_left_offset_length(buffer, &iter);
+ item_continuation = TRUE;
+ }
+
+ if (itemized_len)
+ itemized_chars = compose_get_itemized_chars(buffer, &iter);
+
/* go until paragraph end (empty line) */
while (start || !gtk_text_iter_ends_line(&iter)) {
gchar *scanpos = NULL;
prefs_common.linewrap_len,
quote_len)) {
GtkTextIter prev, next, cur;
-
if (prev_autowrap != FALSE || force) {
compose->automatic_break = TRUE;
modified = TRUE;
gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
compose->automatic_break = FALSE;
+ if (itemized_len && compose->autoindent) {
+ gtk_text_buffer_insert(buffer, &break_pos, itemized_chars, -1);
+ if (!item_continuation)
+ gtk_text_buffer_insert(buffer, &break_pos, " ", 2);
+ }
} else if (quote_str && wrap_quote) {
compose->automatic_break = TRUE;
modified = TRUE;
gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
compose->automatic_break = FALSE;
+ if (itemized_len && compose->autoindent) {
+ gtk_text_buffer_insert(buffer, &break_pos, itemized_chars, -1);
+ if (!item_continuation)
+ gtk_text_buffer_insert(buffer, &break_pos, " ", 2);
+ }
} else
goto colorize;
/* remove trailing spaces */
cur = break_pos;
+ rem_item_len = itemized_len;
+ while (compose->autoindent && rem_item_len-- > 0)
+ gtk_text_iter_backward_char(&cur);
gtk_text_iter_backward_char(&cur);
+
prev = next = cur;
while (!gtk_text_iter_starts_line(&cur)) {
gunichar wc;
removed = TRUE;
}
}
- if (uri_start > 0 && uri_stop > 0) {
+ if (uri_start >= 0 && uri_stop > 0) {
GtkTextIter uri_start_iter, uri_end_iter, back;
gtk_text_buffer_get_iter_at_offset(
buffer, &uri_start_iter, uri_start);
goto end;
}
}
-
debug_print("modified, out after %d lines\n", lines);
end:
+ g_free(itemized_chars);
if (par_iter)
*par_iter = iter;
undo_wrapping(compose->undostruct, FALSE);
subject = gtk_editable_get_chars(
GTK_EDITABLE(compose->subject_entry), 0, -1);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
if (subject && strlen(subject))
str = g_strdup_printf(_("%s - Compose message%s"),
subject, edited);
static void compose_select_account(Compose *compose, PrefsAccount *account,
gboolean init)
{
- GtkItemFactory *ifactory;
gchar *from = NULL;
g_return_if_fail(account != NULL);
compose_set_title(compose);
- ifactory = gtk_item_factory_from_widget(compose->menubar);
-
if (account->default_sign && compose->mode != COMPOSE_REDIRECT)
- menu_set_active(ifactory, "/Options/Sign", TRUE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/Sign", TRUE);
else
- menu_set_active(ifactory, "/Options/Sign", FALSE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/Sign", FALSE);
if (account->default_encrypt && compose->mode != COMPOSE_REDIRECT)
- menu_set_active(ifactory, "/Options/Encrypt", TRUE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/Encrypt", TRUE);
else
- menu_set_active(ifactory, "/Options/Encrypt", FALSE);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Options/Encrypt", FALSE);
activate_privacy_system(compose, account, FALSE);
undo_unblock(compose->undostruct);
}
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
/* use account's dict info if set */
if (compose->gtkaspell) {
if (account->enable_default_dictionary)
for (list = compose->header_list; list; list = list->next) {
gchar *header;
gchar *entry;
- header = gtk_editable_get_chars(GTK_EDITABLE(GTK_BIN(((ComposeHeaderEntry *)list->data)->combo)->child), 0, -1);
+ header = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((((ComposeHeaderEntry *)list->data)->combo)))), 0, -1);
entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
-
g_strstrip(entry);
+ g_strstrip(header);
if (entry[0] != '\0') {
for (strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
if (!strcmp(header, prefs_common_translated_header_name(*strptr))) {
gchar *entry;
gchar *header;
entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
- header = gtk_editable_get_chars(GTK_EDITABLE(GTK_BIN(((ComposeHeaderEntry *)list->data)->combo)->child), 0, -1);
+ header = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((((ComposeHeaderEntry *)list->data)->combo)))), 0, -1);
g_strstrip(entry);
+ g_strstrip(header);
if (strcmp(entry, compose->account->auto_cc)
|| strcmp(header, prefs_common_translated_header_name("Cc:"))) {
found_other = TRUE;
gchar *entry;
gchar *header;
entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
- header = gtk_editable_get_chars(GTK_EDITABLE(GTK_BIN(((ComposeHeaderEntry *)list->data)->combo)->child), 0, -1);
+ header = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((((ComposeHeaderEntry *)list->data)->combo)))), 0, -1);
g_strstrip(entry);
+ g_strstrip(header);
if (strcmp(entry, compose->account->auto_bcc)
|| strcmp(header, prefs_common_translated_header_name("Bcc:"))) {
found_other = TRUE;
button_label = _("+_Send");
else
button_label = _("+_Queue");
- message = g_strdup_printf(_("Subject is empty. %s it anyway?"),
- compose->sending?_("Send"):_("Queue"));
+ message = g_strdup_printf(_("Subject is empty. %s"),
+ compose->sending?_("Send it anyway?"):
+ _("Queue it anyway?"));
aval = alertpanel(compose->sending?_("Send"):_("Send later"), message,
GTK_STOCK_CANCEL, button_label, NULL);
g_free(msgpath);
} else {
val = procmsg_send_message_queue(msgpath, &errstr, folder, msgnum, &queued_removed);
- g_unlink(msgpath);
+ claws_unlink(msgpath);
g_free(msgpath);
}
if (!discard_window) {
first_to_address = TRUE;
for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
- headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(headerentry->combo)->child));
+ headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
if (g_utf8_collate(headerentryname, to_hdr) == 0) {
const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
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_BIN(headerentry->combo)->child));
+ headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
if (g_utf8_collate(headerentryname, cc_hdr) == 0) {
const gchar *strg = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
"X-Claws-End-Special-Headers:", "X-Claws-Account-Id:",
"X-Sylpheed-Privacy", "X-Sylpheed-Sign:", "X-Sylpheed-Encrypt",
"X-Sylpheed-End-Special-Headers:", "X-Sylpheed-Account-Id:",
+ "X-Claws-Auto-Wrapping:", "X-Claws-Auto-Indent:",
NULL
};
if ((fp = g_fopen(compose->redirect_filename, "rb")) == NULL) {
gchar *chars;
gchar *buf;
const gchar *out_codeset;
- EncodingType encoding;
+ EncodingType encoding = ENC_UNKNOWN;
MimeInfo *mimemsg, *mimetext;
gint line;
+ const gchar *src_codeset = CS_INTERNAL;
if (action == COMPOSE_WRITE_FOR_SEND)
attach_parts = TRUE;
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;
+
+ out_codeset = conv_get_charset_str(compose->out_encoding);
+
+ if (!out_codeset && is_ascii_str(chars)) {
+ out_codeset = CS_US_ASCII;
+ } else if (prefs_common.outgoing_fallback_to_ascii &&
+ is_ascii_str(chars)) {
out_codeset = CS_US_ASCII;
encoding = ENC_7BIT;
- } else {
- const gchar *src_codeset = CS_INTERNAL;
+ }
- out_codeset = conv_get_charset_str(compose->out_encoding);
+ if (!out_codeset) {
+ gchar *test_conv_global_out = NULL;
+ gchar *test_conv_reply = NULL;
- if (!out_codeset) {
- gchar *test_conv_global_out = NULL;
- gchar *test_conv_reply = NULL;
+ /* automatic mode. be automatic. */
+ codeconv_set_strict(TRUE);
- /* 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
- && strcmp(compose->orig_charset, CS_US_ASCII)) {
- 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("failure; finally using %s\n", out_codeset);
- }
- g_free(test_conv_global_out);
- g_free(test_conv_reply);
- codeconv_set_strict(FALSE);
+ 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
+ && strcmp(compose->orig_charset, CS_US_ASCII)) {
+ 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 (!g_ascii_strcasecmp(out_codeset, CS_US_ASCII))
- out_codeset = CS_ISO_8859_1;
+ if (!test_conv_global_out && !test_conv_reply) {
+ /* we're lost */
+ out_codeset = CS_INTERNAL;
+ debug_print("failure; finally using %s\n", out_codeset);
+ }
+ g_free(test_conv_global_out);
+ g_free(test_conv_reply);
+ codeconv_set_strict(FALSE);
+ }
+ if (encoding == ENC_UNKNOWN) {
if (prefs_common.encoding_method == CTE_BASE64)
encoding = ENC_BASE64;
else if (prefs_common.encoding_method == CTE_QUOTED_PRINTABLE)
encoding = ENC_8BIT;
else
encoding = procmime_get_encoding_for_charset(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;
+ debug_print("src encoding = %s, out encoding = %s, transfer encoding = %s\n",
+ src_codeset, out_codeset, procmime_get_encoding_str(encoding));
- 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_CANCEL, _("+_Send"), NULL, FALSE,
- NULL, ALERT_ERROR, G_ALERTDEFAULT);
- g_free(msg);
+ if (action == COMPOSE_WRITE_FOR_SEND) {
+ codeconv_set_strict(TRUE);
+ buf = conv_codeset_strdup(chars, src_codeset, out_codeset);
+ codeconv_set_strict(FALSE);
- if (aval != G_ALERTALTERNATE) {
- g_free(chars);
- return -3;
- } else {
- buf = chars;
- out_codeset = src_codeset;
- chars = NULL;
- }
+ if (!buf) {
+ AlertValue aval;
+ gchar *msg;
+
+ 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_CANCEL, _("+_Send"), NULL, FALSE,
+ NULL, ALERT_ERROR, G_ALERTDEFAULT);
+ g_free(msg);
+
+ if (aval != G_ALERTALTERNATE) {
+ g_free(chars);
+ return -3;
+ } else {
+ buf = chars;
+ out_codeset = src_codeset;
+ chars = NULL;
}
- } else {
- buf = chars;
- out_codeset = src_codeset;
- chars = NULL;
}
+ } else {
+ buf = chars;
+ out_codeset = src_codeset;
+ chars = NULL;
}
g_free(chars);
FILE_OP_ERROR(file, "fwrite");
g_free(chars);
fclose(fp);
- g_unlink(file);
+ claws_unlink(file);
return -1;
}
if (fclose(fp) == EOF) {
FILE_OP_ERROR(file, "fclose");
- g_unlink(file);
+ claws_unlink(file);
return -1;
}
return 0;
if (!compose_warn_encryption(compose)) {
lock = FALSE;
fclose(fp);
- g_unlink(tmp);
+ claws_unlink(tmp);
g_free(tmp);
return -6;
}
* key selection */
lock = FALSE;
fclose(fp);
- g_unlink(tmp);
+ claws_unlink(tmp);
g_free(tmp);
return -5;
}
g_free(folderid);
}
+ err |= (fprintf(fp, "X-Claws-Auto-Wrapping:%d\n", compose->autowrap) < 0);
+ err |= (fprintf(fp, "X-Claws-Auto-Indent:%d\n", compose->autoindent) < 0);
+
/* end of headers */
err |= (fprintf(fp, "X-Claws-End-Special-Headers: 1\n") < 0);
if (compose_redirect_write_to_file(compose, fp) < 0) {
lock = FALSE;
fclose(fp);
- g_unlink(tmp);
+ claws_unlink(tmp);
g_free(tmp);
return -2;
}
if ((result = compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND, TRUE)) < 0) {
lock = FALSE;
fclose(fp);
- g_unlink(tmp);
+ claws_unlink(tmp);
g_free(tmp);
return result - 1; /* -2 for a generic error, -3 for signing error, -4 for encoding */
}
if (err == TRUE) {
g_warning("failed to write queue message\n");
fclose(fp);
- g_unlink(tmp);
+ claws_unlink(tmp);
g_free(tmp);
lock = FALSE;
return -2;
}
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
- g_unlink(tmp);
+ claws_unlink(tmp);
g_free(tmp);
lock = FALSE;
return -2;
}
if (!queue) {
g_warning("can't find queue folder\n");
- g_unlink(tmp);
+ claws_unlink(tmp);
g_free(tmp);
lock = FALSE;
return -1;
folder_item_scan(queue);
if ((num = folder_item_add_msg(queue, tmp, NULL, FALSE)) < 0) {
g_warning("can't queue the message\n");
- g_unlink(tmp);
+ claws_unlink(tmp);
g_free(tmp);
lock = FALSE;
return -1;
}
if (msgpath == NULL) {
- g_unlink(tmp);
+ claws_unlink(tmp);
g_free(tmp);
} else
*msgpath = tmp;
for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
- headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(headerentry->combo)->child));
+ headerentryname = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo)))));
if (!g_utf8_collate(trans_fieldname, headerentryname)) {
str = gtk_editable_get_chars(GTK_EDITABLE(headerentry->entry), 0, -1);
}
}
+ /* Automatic Faces and X-Faces */
+ if (get_account_xface (buf, sizeof(buf), compose->account->account_name) == 0) {
+ g_string_append_printf(header, "X-Face: %s\n", buf);
+ }
+ else if (get_default_xface (buf, sizeof(buf)) == 0) {
+ g_string_append_printf(header, "X-Face: %s\n", buf);
+ }
+ if (get_account_face (buf, sizeof(buf), compose->account->account_name) == 0) {
+ g_string_append_printf(header, "Face: %s\n", buf);
+ }
+ else if (get_default_face (buf, sizeof(buf)) == 0) {
+ g_string_append_printf(header, "Face: %s\n", buf);
+ }
+
/* PRIORITY */
switch (compose->priority) {
case PRIORITY_HIGHEST: g_string_append_printf(header, "Importance: high\n"
gboolean standard_header = FALSE;
headerentry = ((ComposeHeaderEntry *)list->data);
-
- tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_BIN(headerentry->combo)->child)));
- if (strchr(tmp, ' ') != NULL || strchr(tmp, '\r') != NULL || strchr(tmp, '\n') != NULL) {
+
+ tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((headerentry->combo))))));
+ g_strstrip(tmp);
+ if (*tmp == '\0' || strchr(tmp, ' ') != NULL || strchr(tmp, '\r') != NULL || strchr(tmp, '\n') != NULL) {
g_free(tmp);
continue;
}
const gchar *header = NULL;
ComposeHeaderEntry *headerentry;
gboolean standard_header = FALSE;
+#if !(GTK_CHECK_VERSION(2,12,0))
+ GtkTooltips *tips = compose->tooltips;
+#endif
headerentry = g_new0(ComposeHeaderEntry, 1);
/* Combo box */
combo = gtk_combo_box_entry_new_text();
- gtk_size_group_add_widget(compose->size_group, combo);
string = headers;
while(*string != NULL) {
gtk_combo_box_append_text(GTK_COMBO_BOX(combo),
string++;
}
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
- g_signal_connect(G_OBJECT(GTK_BIN(combo)->child), "grab_focus",
+ g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN((combo)))), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
gtk_widget_show(combo);
gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1,
GTK_SHRINK, GTK_FILL, 0, 0);
if (compose->header_last) {
const gchar *last_header_entry = gtk_entry_get_text(
- GTK_ENTRY(GTK_BIN(compose->header_last->combo)->child));
+ GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))));
string = headers;
while (*string != NULL) {
if (!strcmp(*string, last_header_entry))
string++;
}
if (standard_header)
- header = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(compose->header_last->combo)->child));
+ header = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))));
}
if (!compose->header_last || !standard_header) {
switch(compose->account->protocol) {
}
}
if (header)
- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(combo)->child), header);
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((combo)))), header);
- g_signal_connect_after(G_OBJECT(GTK_BIN(combo)->child), "grab_focus",
+ g_signal_connect_after(G_OBJECT(gtk_bin_get_child(GTK_BIN((combo)))), "grab_focus",
G_CALLBACK(compose_grab_focus_cb), compose);
/* Entry field */
entry = gtk_entry_new();
gtk_widget_show(entry);
- gtk_tooltips_set_tip(compose->tooltips, entry,
- _("Use <tab> to autocomplete from addressbook"), NULL);
+ CLAWS_SET_TIP(entry,
+ _("Use <tab> to autocomplete from addressbook"));
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);
last_header = compose->header_last;
- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(last_header->combo)->child), header);
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((last_header->combo)))), header);
gtk_entry_set_text(GTK_ENTRY(last_header->entry), text);
}
gint count = 0;
- compose->size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-
/* header labels and entries */
header_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(header_scrolledwin);
header_table = gtk_table_new(2, 2, FALSE);
gtk_widget_show(header_table);
gtk_container_set_border_width(GTK_CONTAINER(header_table), BORDER_WIDTH);
- gtk_table_set_col_spacings(GTK_TABLE(header_table), 6);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
- gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_NONE);
+ gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN((header_scrolledwin)))), GTK_SHADOW_NONE);
count = 0;
/* option menu for selecting accounts */
FolderItem *dest;
gchar * path;
- dest = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL);
+ dest = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE);
if (!dest) return;
path = folder_item_get_identifier(dest);
Compose *compose)
{
gint prev_autowrap;
- GtkTextBuffer *buffer;
-#if USE_ASPELL
+ GtkTextBuffer *buffer = GTK_TEXT_VIEW(text)->buffer;
+#if USE_ENCHANT
if (event->button == 3) {
GtkTextIter iter;
GtkTextIter sel_start, sel_end;
gint x, y;
/* move the cursor to allow GtkAspell to check the word
* under the mouse */
- gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(text),
- GTK_TEXT_WINDOW_TEXT, event->x, event->y,
- &x, &y);
- gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW(text),
- &iter, x, y);
+ if (event->x && event->y) {
+ gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(text),
+ GTK_TEXT_WINDOW_TEXT, event->x, event->y,
+ &x, &y);
+ gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW(text),
+ &iter, x, y);
+ } else {
+ GtkTextMark *mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+ }
/* get selection */
stuff_selected = gtk_text_buffer_get_selection_bounds(
- GTK_TEXT_VIEW(text)->buffer,
+ buffer,
&sel_start, &sel_end);
- gtk_text_buffer_place_cursor (GTK_TEXT_VIEW(text)->buffer, &iter);
+ gtk_text_buffer_place_cursor (buffer, &iter);
/* reselect stuff */
if (stuff_selected
&& gtk_text_iter_in_range(&iter, &sel_start, &sel_end)) {
- gtk_text_buffer_select_range(GTK_TEXT_VIEW(text)->buffer,
+ gtk_text_buffer_select_range(buffer,
&sel_start, &sel_end);
}
return FALSE; /* pass the event so that the right-click goes through */
return FALSE;
}
-#if USE_ASPELL
+#if USE_ENCHANT
static void compose_spell_menu_changed(void *data)
{
Compose *compose = (Compose *)data;
GtkWidget *menuitem;
GtkWidget *parent_item;
GtkMenu *menu = GTK_MENU(gtk_menu_new());
- GtkItemFactory *ifactory = gtk_item_factory_from_widget(compose->menubar);
GSList *spell_menu;
if (compose->gtkaspell == NULL)
return;
- parent_item = gtk_item_factory_get_item(ifactory,
- "/Spelling/Options");
+ parent_item = gtk_ui_manager_get_widget(compose->ui_manager,
+ "/Menu/Spelling/Options");
/* setting the submenu removes /Spelling/Options from the factory
* so we need to save it */
if (parent_item == NULL) {
parent_item = compose->aspell_options_menu;
- gtk_menu_item_remove_submenu(GTK_MENU_ITEM(parent_item));
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(parent_item), NULL);
} else
compose->aspell_options_menu = parent_item;
event.button = 3;
event.time = gtk_get_current_event_time();
+ event.x = 0;
+ event.y = 0;
return text_clicked(compose->text, &event, compose);
}
GtkWidget *text;
GtkTextBuffer *buffer;
GtkClipboard *clipboard;
+ CLAWS_TIP_DECL();
UndoMain *undostruct;
gchar *titles[N_ATTACH_COLS];
- guint n_menu_entries;
GtkWidget *popupmenu;
- GtkItemFactory *popupfactory;
- GtkItemFactory *ifactory;
GtkWidget *tmpl_menu;
- gint n_entries;
- GtkWidget *menuitem;
+ GtkActionGroup *action_group = NULL;
-#if USE_ASPELL
+#if USE_ENCHANT
GtkAspell * gtkaspell = NULL;
#endif
compose->mutex = g_mutex_new();
compose->set_cursor_pos = -1;
- compose->tooltips = gtk_tooltips_new();
+#if !(GTK_CHECK_VERSION(2,12,0))
+ compose->tooltips = tips;
+#endif
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose");
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
&geometry, GDK_HINT_MIN_SIZE);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
if (compose_force_window_origin)
- gtk_widget_set_uposition(window, prefs_common.compose_x,
+ gtk_window_move(GTK_WINDOW(window), prefs_common.compose_x,
prefs_common.compose_y);
#endif
g_signal_connect(G_OBJECT(window), "delete_event",
vbox = gtk_vbox_new(FALSE, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
- n_menu_entries = sizeof(compose_entries) / sizeof(compose_entries[0]);
- menubar = menubar_create(window, compose_entries,
- n_menu_entries, "<Compose>", compose);
+ compose->ui_manager = gtk_ui_manager_new();
+ action_group = cm_menu_create_action_group_full(compose->ui_manager,"Menu", compose_entries,
+ G_N_ELEMENTS(compose_entries), (gpointer)compose);
+ gtk_action_group_add_toggle_actions(action_group, compose_toggle_entries,
+ G_N_ELEMENTS(compose_toggle_entries), (gpointer)compose);
+ gtk_action_group_add_radio_actions(action_group, compose_radio_rm_entries,
+ G_N_ELEMENTS(compose_radio_rm_entries), COMPOSE_REPLY, G_CALLBACK(compose_reply_change_mode_cb), (gpointer)compose);
+ gtk_action_group_add_radio_actions(action_group, compose_radio_prio_entries,
+ G_N_ELEMENTS(compose_radio_prio_entries), PRIORITY_NORMAL, G_CALLBACK(compose_set_priority_cb), (gpointer)compose);
+ gtk_action_group_add_radio_actions(action_group, compose_radio_enc_entries,
+ G_N_ELEMENTS(compose_radio_enc_entries), C_AUTO, G_CALLBACK(compose_set_encoding_cb), (gpointer)compose);
+
+#ifndef MAEMO
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
+#else
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENU)
+#endif
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Message", "Message", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
+#ifdef USE_ENCHANT
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Spelling", "Spelling", GTK_UI_MANAGER_MENU)
+#endif
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Options", "Options", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Tools", "Tools", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu", "Help", "Help", GTK_UI_MANAGER_MENU)
+
+/* Compose menu */
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Message", "Send", "Message/Send", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Message", "SendLater", "Message/SendLater", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Message", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Message", "AttachFile", "Message/AttachFile", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Message", "InsertFile", "Message/InsertFile", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Message", "InsertSig", "Message/InsertSig", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Message", "Separator2", "Message/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Message", "Save", "Message/Save", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Message", "Separator3", "Message/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Message", "Close", "Message/Close", GTK_UI_MANAGER_MENUITEM)
+
+/* Edit menu */
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "Undo", "Edit/Undo", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "Redo", "Edit/Redo", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "Separator1", "Edit/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "Cut", "Edit/Cut", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "Copy", "Edit/Copy", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "Paste", "Edit/Paste", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "SpecialPaste", "Edit/SpecialPaste", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/SpecialPaste", "AsQuotation", "Edit/SpecialPaste/AsQuotation", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/SpecialPaste", "Wrapped", "Edit/SpecialPaste/Wrapped", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/SpecialPaste", "Unwrapped", "Edit/SpecialPaste/Unwrapped", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "SelectAll", "Edit/SelectAll", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "Advanced", "Edit/Advanced", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "BackChar", "Edit/Advanced/BackChar", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "ForwChar", "Edit/Advanced/ForwChar", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "BackWord", "Edit/Advanced/BackWord", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "ForwWord", "Edit/Advanced/ForwWord", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "BegLine", "Edit/Advanced/BegLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "EndLine", "Edit/Advanced/EndLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "PrevLine", "Edit/Advanced/PrevLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "NextLine", "Edit/Advanced/NextLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "DelBackChar", "Edit/Advanced/DelBackChar", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "DelForwChar", "Edit/Advanced/DelForwChar", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "DelBackWord", "Edit/Advanced/DelBackWord", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "DelForwWord", "Edit/Advanced/DelForwWord", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "DelLine", "Edit/Advanced/DelLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit/Advanced", "DelEndLine", "Edit/Advanced/DelEndLine", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "Separator2", "Edit/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "Find", "Edit/Find", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "WrapPara", "Edit/WrapPara", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "WrapAllLines", "Edit/WrapAllLines", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "AutoWrap", "Edit/AutoWrap", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "AutoIndent", "Edit/AutoIndent", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "Separator3", "Edit/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Edit", "ExtEditor", "Edit/ExtEditor", GTK_UI_MANAGER_MENUITEM)
+
+#if USE_ENCHANT
+/* Spelling menu */
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Spelling", "CheckAllSel", "Spelling/CheckAllSel", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Spelling", "HighlightAll", "Spelling/HighlightAll", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Spelling", "CheckBackwards", "Spelling/CheckBackwards", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Spelling", "ForwardNext", "Spelling/ForwardNext", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Spelling", "Separator1", "Spelling/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Spelling", "Options", "Spelling/Options", GTK_UI_MANAGER_MENU)
+#endif
+
+/* Options menu */
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "ReplyMode", "Options/ReplyMode", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/ReplyMode", "Normal", "Options/ReplyMode/Normal", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/ReplyMode", "All", "Options/ReplyMode/All", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/ReplyMode", "Sender", "Options/ReplyMode/Sender", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/ReplyMode", "List", "Options/ReplyMode/List", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "Separator1", "Options/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "PrivacySystem", "Options/PrivacySystem", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/PrivacySystem", "PlaceHolder", "Options/PrivacySystem/PlaceHolder", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "Sign", "Options/Sign", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "Encrypt", "Options/Encrypt", GTK_UI_MANAGER_MENUITEM)
+
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "Separator2", "Options/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "Priority", "Options/Priority", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Priority", "Highest", "Options/Priority/Highest", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Priority", "High", "Options/Priority/High", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Priority", "Normal", "Options/Priority/Normal", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Priority", "Low", "Options/Priority/Low", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Priority", "Lowest", "Options/Priority/Lowest", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "Separator3", "Options/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "RequestRetRcpt", "Options/RequestRetRcpt", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "Separator4", "Options/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "RemoveReferences", "Options/RemoveReferences", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "Separator5", "Options/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options", "Encoding", "Options/Encoding", GTK_UI_MANAGER_MENU)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_AUTO, "Options/Encoding/"CS_AUTO, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Separator1", "Options/Encoding/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_US_ASCII, "Options/Encoding/"CS_US_ASCII, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_UTF_8, "Options/Encoding/"CS_UTF_8, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Separator2", "Options/Encoding/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Western", "Options/Encoding/Western", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Western", CS_ISO_8859_1, "Options/Encoding/Western/"CS_ISO_8859_1, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Western", CS_ISO_8859_15, "Options/Encoding/Western/"CS_ISO_8859_15, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Western", CS_WINDOWS_1252, "Options/Encoding/Western/"CS_WINDOWS_1252, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_ISO_8859_2, "Options/Encoding/"CS_ISO_8859_2, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Baltic", "Options/Encoding/Baltic", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Baltic", CS_ISO_8859_13, "Options/Encoding/Baltic/"CS_ISO_8859_13, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Baltic", CS_ISO_8859_4, "Options/Encoding/Baltic/"CS_ISO_8859_4, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_ISO_8859_7, "Options/Encoding/"CS_ISO_8859_7, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Hebrew", "Options/Encoding/Hebrew", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Hebrew", CS_ISO_8859_8, "Options/Encoding/Hebrew/"CS_ISO_8859_8, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Hebrew", CS_WINDOWS_1255, "Options/Encoding/Hebrew/"CS_WINDOWS_1255, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Arabic", "Options/Encoding/Arabic", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Arabic", CS_ISO_8859_6, "Options/Encoding/Arabic/"CS_ISO_8859_6, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Arabic", CS_WINDOWS_1256, "Options/Encoding/Arabic/"CS_WINDOWS_1256, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_ISO_8859_9, "Options/Encoding/"CS_ISO_8859_9, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Cyrillic", "Options/Encoding/Cyrillic", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Cyrillic", CS_ISO_8859_5, "Options/Encoding/Cyrillic/"CS_ISO_8859_5, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Cyrillic", CS_KOI8_R, "Options/Encoding/Cyrillic/"CS_KOI8_R, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Cyrillic", CS_KOI8_U, "Options/Encoding/Cyrillic/"CS_KOI8_U, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Cyrillic", CS_WINDOWS_1251, "Options/Encoding/Cyrillic/"CS_WINDOWS_1251, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Japanese", "Options/Encoding/Japanese", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Japanese", CS_ISO_2022_JP, "Options/Encoding/Japanese/"CS_ISO_2022_JP, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Japanese", CS_ISO_2022_JP_2, "Options/Encoding/Japanese/"CS_ISO_2022_JP_2, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Japanese", CS_EUC_JP, "Options/Encoding/Japanese/"CS_EUC_JP, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Japanese", CS_SHIFT_JIS, "Options/Encoding/Japanese/"CS_SHIFT_JIS, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Chinese", "Options/Encoding/Chinese", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Chinese", CS_GB2312, "Options/Encoding/Chinese/"CS_GB2312, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Chinese", CS_GBK, "Options/Encoding/Chinese/"CS_GBK, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Chinese", CS_BIG5, "Options/Encoding/Chinese/"CS_BIG5, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Chinese", CS_EUC_TW, "Options/Encoding/Chinese/"CS_EUC_TW, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Korean", "Options/Encoding/Korean", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Korean", CS_EUC_KR, "Options/Encoding/Korean/"CS_EUC_KR, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Korean", CS_ISO_2022_KR, "Options/Encoding/Korean/"CS_ISO_2022_KR, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Thai", "Options/Encoding/Thai", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Thai", CS_TIS_620, "Options/Encoding/Thai/"CS_TIS_620, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Thai", CS_WINDOWS_874, "Options/Encoding/Thai/"CS_WINDOWS_874, GTK_UI_MANAGER_MENUITEM)
+/* phew. */
+
+/* Tools menu */
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "ShowRuler", "Tools/ShowRuler", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "AddressBook", "Tools/AddressBook", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "Template", "Tools/Template", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools/Template", "PlaceHolder", "Tools/Template/PlaceHolder", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "Actions", "Tools/Actions", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools/Actions", "PlaceHolder", "Tools/Actions/PlaceHolder", GTK_UI_MANAGER_MENUITEM)
+
+/* Help menu */
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Help", "About", "Help/About", GTK_UI_MANAGER_MENUITEM)
+
+ menubar = gtk_ui_manager_get_widget(compose->ui_manager, "/Menu");
+ gtk_widget_show_all(menubar);
+
+ gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(compose->ui_manager));
+#ifndef MAEMO
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+#else
+ hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
+#endif
if (prefs_common.toolbar_detachable) {
handlebox = gtk_handle_box_new();
/* pane between attach clist and text */
paned = gtk_vpaned_new();
- gtk_paned_set_gutter_size(GTK_PANED(paned), 12);
gtk_container_add(GTK_CONTAINER(vbox2), paned);
#ifdef MAEMO
if( maemo_mainwindow_is_fullscreen(mainwindow_get_mainwindow()->window) )
}
}
- n_entries = sizeof(compose_popup_entries) /
- sizeof(compose_popup_entries[0]);
- popupmenu = menu_create_items(compose_popup_entries, n_entries,
- "<Compose>", &popupfactory,
- compose);
+ gtk_action_group_add_actions(action_group, compose_popup_entries,
+ G_N_ELEMENTS(compose_popup_entries), (gpointer)compose);
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/", "Popup", NULL, GTK_UI_MANAGER_MENUBAR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup", "Compose", "Compose", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Add", "Compose/Add", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Remove", "Compose/Remove", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Separator1", "Compose/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Popup/Compose", "Properties", "Compose/Properties", GTK_UI_MANAGER_MENUITEM)
+
+ popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtk_ui_manager_get_widget(compose->ui_manager, "/Popup/Compose")));
- 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, "/Options/Remove references", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Undo", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Redo", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/RemoveReferences", FALSE);
- tmpl_menu = gtk_item_factory_get_item(ifactory, "/Tools/Template");
+ tmpl_menu = gtk_ui_manager_get_widget(compose->ui_manager, "/Menu/Tools/Template");
undostruct = undo_init(text);
undo_set_change_state_func(undostruct, &compose_undo_state_changed,
- menubar);
+ compose);
address_completion_start(window);
compose->focused_editable = NULL;
compose->popupmenu = popupmenu;
- compose->popupfactory = popupfactory;
compose->tmpl_menu = tmpl_menu;
compose->boundary = NULL;
compose->autowrap = prefs_common.autowrap;
-
+ compose->autoindent = prefs_common.auto_indent;
compose->use_signing = FALSE;
compose->use_encryption = FALSE;
compose->privacy_system = NULL;
compose->exteditor_tag = -1;
compose->draft_timeout_tag = -2; /* inhibit auto-drafting while loading */
-#if USE_ASPELL
- menu_set_sensitive(ifactory, "/Spelling", FALSE);
+#if USE_ENCHANT
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Spelling", FALSE);
if (mode != COMPOSE_REDIRECT) {
if (prefs_common.enable_aspell && prefs_common.dictionary &&
strcmp(prefs_common.dictionary, "")) {
- gtkaspell = gtkaspell_new(prefs_common.aspell_path,
- prefs_common.dictionary,
+ gtkaspell = gtkaspell_new(prefs_common.dictionary,
prefs_common.alt_dictionary,
conv_get_locale_charset_str(),
prefs_common.misspelled_col,
gtkaspell_checkers_strerror());
gtkaspell_checkers_reset_error();
} else {
- if (!gtkaspell_set_sug_mode(gtkaspell,
- prefs_common.aspell_sugmode)) {
- debug_print("Aspell: could not set "
- "suggestion mode %s\n",
- gtkaspell_checkers_strerror());
- gtkaspell_checkers_reset_error();
- }
-
- menu_set_sensitive(ifactory, "/Spelling", TRUE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Spelling", TRUE);
}
}
}
compose_select_account(compose, account, TRUE);
- menu_set_active(ifactory, "/Edit/Auto wrapping", prefs_common.autowrap);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Edit/AutoWrap", prefs_common.autowrap);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Edit/AutoIndent", prefs_common.auto_indent);
+
if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_cc, COMPOSE_CC);
if (account->set_autoreplyto && account->auto_replyto && mode != COMPOSE_REEDIT)
compose_entry_append(compose, account->auto_replyto, COMPOSE_REPLYTO);
- menu_set_sensitive(ifactory, "/Options/Reply mode", compose->mode == COMPOSE_REPLY);
-
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/ReplyMode", compose->mode == COMPOSE_REPLY);
if (account->protocol != A_NNTP)
- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(compose->header_last->combo)->child),
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))),
prefs_common_translated_header_name("To:"));
else
- gtk_entry_set_text(GTK_ENTRY(GTK_BIN(compose->header_last->combo)->child),
+ gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((compose->header_last->combo)))),
prefs_common_translated_header_name("Newsgroups:"));
addressbook_set_target_compose(compose);
if (mode != COMPOSE_REDIRECT)
compose_set_template_menu(compose);
else {
- menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Template");
- menu_set_sensitive(ifactory, "/Tools/Template", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Tools/Template", FALSE);
}
compose_list = g_list_append(compose_list, compose);
if (!prefs_common.show_ruler)
gtk_widget_hide(ruler_hbox);
- menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Show ruler");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- prefs_common.show_ruler);
+ cm_toggle_menu_set_active_full(compose->ui_manager, "Menu/Tools/ShowRuler", prefs_common.show_ruler);
/* Priority */
compose->priority = PRIORITY_NORMAL;
GtkListStore *menu;
GtkTreeIter iter;
GtkWidget *from_name = NULL;
+#if !(GTK_CHECK_VERSION(2,12,0))
+ GtkTooltips *tips = compose->tooltips;
+#endif
gint num = 0, def_menu = 0;
optmenubox = gtk_event_box_new();
optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
- gtk_size_group_add_widget(compose->size_group, optmenu);
menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
hbox = gtk_hbox_new(FALSE, 6);
gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0);
- gtk_tooltips_set_tip(compose->tooltips, optmenubox,
- _("Account to use for this email"), NULL);
- gtk_tooltips_set_tip(compose->tooltips, from_name,
- _("Sender address to be used"), NULL);
+ CLAWS_SET_TIP(optmenubox,
+ _("Account to use for this email"));
+ CLAWS_SET_TIP(from_name,
+ _("Sender address to be used"));
compose->from_name = from_name;
return hbox;
}
-static void compose_set_priority_cb(gpointer data,
- guint action,
- GtkWidget *widget)
+static void compose_set_priority_cb(GtkAction *action, GtkRadioAction *current, gpointer data)
{
+ gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
+ gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
Compose *compose = (Compose *) data;
- compose->priority = action;
+ if (active) {
+ compose->priority = value;
+ }
}
-static void compose_reply_change_mode(gpointer data,
- ComposeMode action,
- GtkWidget *widget)
+static void compose_reply_change_mode(Compose *compose,
+ ComposeMode action)
{
- Compose *compose = (Compose *) data;
gboolean was_modified = compose->modified;
gboolean all = FALSE, ml = FALSE, sender = FALSE, followup = FALSE;
compose_set_title(compose);
}
+static void compose_reply_change_mode_cb(GtkAction *action, GtkRadioAction *current, gpointer data)
+{
+ gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
+ gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
+ Compose *compose = (Compose *) data;
+
+ if (active)
+ compose_reply_change_mode(compose, value);
+}
+
static void compose_update_priority_menu_item(Compose * compose)
{
- GtkItemFactory *ifactory;
GtkWidget *menuitem = NULL;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
-
switch (compose->priority) {
case PRIORITY_HIGHEST:
- menuitem = gtk_item_factory_get_item
- (ifactory, "/Options/Priority/Highest");
+ menuitem = gtk_ui_manager_get_widget
+ (compose->ui_manager, "/Menu/Options/Priority/Highest");
break;
case PRIORITY_HIGH:
- menuitem = gtk_item_factory_get_item
- (ifactory, "/Options/Priority/High");
+ menuitem = gtk_ui_manager_get_widget
+ (compose->ui_manager, "/Menu/Options/Priority/High");
break;
case PRIORITY_NORMAL:
- menuitem = gtk_item_factory_get_item
- (ifactory, "/Options/Priority/Normal");
+ menuitem = gtk_ui_manager_get_widget
+ (compose->ui_manager, "/Menu/Options/Priority/Normal");
break;
case PRIORITY_LOW:
- menuitem = gtk_item_factory_get_item
- (ifactory, "/Options/Priority/Low");
+ menuitem = gtk_ui_manager_get_widget
+ (compose->ui_manager, "/Menu/Options/Priority/Low");
break;
case PRIORITY_LOWEST:
- menuitem = gtk_item_factory_get_item
- (ifactory, "/Options/Priority/Lowest");
+ menuitem = gtk_ui_manager_get_widget
+ (compose->ui_manager, "/Menu/Options/Priority/Lowest");
break;
}
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
{
Compose *compose = (Compose *) data;
gchar *systemid;
- GtkItemFactory *ifactory;
gboolean can_sign = FALSE, can_encrypt = FALSE;
g_return_if_fail(GTK_IS_CHECK_MENU_ITEM(widget));
debug_print("activated privacy system: %s\n", systemid != NULL ? systemid : "None");
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_sensitive(ifactory, "/Options/Sign", can_sign);
- menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/Sign", can_sign);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/Encrypt", can_encrypt);
}
static void compose_update_privacy_system_menu_item(Compose * compose, gboolean warn)
{
- static gchar *branch_path = "/Options/Privacy System";
- GtkItemFactory *ifactory;
+ static gchar *branch_path = "/Menu/Options/PrivacySystem";
GtkWidget *menuitem = NULL;
GList *amenu;
gboolean can_sign = FALSE, can_encrypt = FALSE;
gboolean found = FALSE;
- ifactory = gtk_item_factory_from_widget(compose->menubar);
-
if (compose->privacy_system != NULL) {
gchar *systemid;
-
- menuitem = gtk_item_factory_get_widget(ifactory, branch_path);
+ menuitem = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+ gtk_ui_manager_get_widget(compose->ui_manager, branch_path)));
g_return_if_fail(menuitem != NULL);
amenu = GTK_MENU_SHELL(menuitem)->children;
systemid = g_object_get_data(G_OBJECT(amenu->data), "privacy_system");
if (systemid != NULL) {
- if (strcmp(systemid, compose->privacy_system) == 0) {
+ if (strcmp(systemid, compose->privacy_system) == 0 &&
+ GTK_IS_CHECK_MENU_ITEM(amenu->data)) {
menuitem = GTK_WIDGET(amenu->data);
can_sign = privacy_system_can_sign(systemid);
found = TRUE;
break;
}
- } else if (strlen(compose->privacy_system) == 0) {
+ } else if (strlen(compose->privacy_system) == 0 &&
+ GTK_IS_CHECK_MENU_ITEM(amenu->data)) {
menuitem = GTK_WIDGET(amenu->data);
can_sign = FALSE;
}
}
- menu_set_sensitive(ifactory, "/Options/Sign", can_sign);
- menu_set_sensitive(ifactory, "/Options/Encrypt", can_encrypt);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/Sign", can_sign);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options/Encrypt", can_encrypt);
}
static void compose_set_out_encoding(Compose *compose)
{
- GtkItemFactoryEntry *entry;
- GtkItemFactory *ifactory;
CharSet out_encoding;
- gchar *path, *p, *q;
- GtkWidget *item;
-
+ const gchar *branch = NULL;
out_encoding = conv_get_charset_from_str(prefs_common.outgoing_charset);
- ifactory = gtk_item_factory_from_widget(compose->menubar);
-
- for (entry = compose_entries; entry->callback != compose_address_cb;
- entry++) {
- if (entry->callback == compose_set_encoding_cb &&
- (CharSet)entry->callback_action == out_encoding) {
- p = q = path = g_strdup(entry->path);
- while (*p) {
- if (*p == '_') {
- if (p[1] == '_') {
- p++;
- *q++ = '_';
- }
- } else
- *q++ = *p;
- p++;
- }
- *q = '\0';
- item = gtk_item_factory_get_item(ifactory, path);
- gtk_widget_activate(item);
- g_free(path);
- break;
- }
- }
+
+ switch(out_encoding) {
+ case C_AUTO: branch = "Menu/Options/Encoding/" CS_AUTO; break;
+ case C_US_ASCII: branch = "Menu/Options/Encoding/" CS_US_ASCII; break;
+ case C_UTF_8: branch = "Menu/Options/Encoding/" CS_UTF_8; break;
+ case C_ISO_8859_2: branch = "Menu/Options/Encoding/" CS_ISO_8859_2; break;
+ case C_ISO_8859_7: branch = "Menu/Options/Encoding/" CS_ISO_8859_7; break;
+ case C_ISO_8859_9: branch = "Menu/Options/Encoding/" CS_ISO_8859_9; break;
+ case C_ISO_8859_1: branch = "Menu/Options/Encoding/Western/" CS_ISO_8859_1; break;
+ case C_ISO_8859_15: branch = "Menu/Options/Encoding/Western/" CS_ISO_8859_15; break;
+ case C_WINDOWS_1252: branch = "Menu/Options/Encoding/Western/" CS_WINDOWS_1252; break;
+ case C_ISO_8859_13: branch = "Menu/Options/Encoding/Baltic/" CS_ISO_8859_13; break;
+ case C_ISO_8859_4: branch = "Menu/Options/Encoding/Baltic" CS_ISO_8859_4; break;
+ case C_ISO_8859_8: branch = "Menu/Options/Encoding/Hebrew/" CS_ISO_8859_8; break;
+ case C_WINDOWS_1255: branch = "Menu/Options/Encoding/Hebrew/" CS_WINDOWS_1255; break;
+ case C_ISO_8859_6: branch = "Menu/Options/Encoding/Arabic/" CS_ISO_8859_6; break;
+ case C_WINDOWS_1256: branch = "Menu/Options/Encoding/Arabic/" CS_WINDOWS_1256; break;
+ case C_ISO_8859_5: branch = "Menu/Options/Encoding/Cyrillic/" CS_ISO_8859_5; break;
+ case C_KOI8_R: branch = "Menu/Options/Encoding/Cyrillic/" CS_KOI8_R; break;
+ case C_KOI8_U: branch = "Menu/Options/Encoding/Cyrillic/" CS_KOI8_U; break;
+ case C_WINDOWS_1251: branch = "Menu/Options/Encoding/Cyrillic/" CS_WINDOWS_1251; break;
+ case C_ISO_2022_JP: branch = "Menu/Options/Encoding/Japanese/" CS_ISO_2022_JP; break;
+ case C_ISO_2022_JP_2: branch = "Menu/Options/Encoding/Japanese/" CS_ISO_2022_JP_2; break;
+ case C_EUC_JP: branch = "Menu/Options/Encoding/Japanese/" CS_EUC_JP; break;
+ case C_SHIFT_JIS: branch = "Menu/Options/Encoding/Japanese/" CS_SHIFT_JIS; break;
+ case C_GB2312: branch = "Menu/Options/Encoding/Chinese/" CS_GB2312; break;
+ case C_GBK: branch = "Menu/Options/Encoding/Chinese/" CS_GBK; break;
+ case C_BIG5: branch = "Menu/Options/Encoding/Chinese/" CS_BIG5; break;
+ case C_EUC_TW: branch = "Menu/Options/Encoding/Chinese/" CS_EUC_TW; break;
+ case C_EUC_KR: branch = "Menu/Options/Encoding/Korean/" CS_EUC_KR; break;
+ case C_ISO_2022_KR: branch = "Menu/Options/Encoding/Korean/" CS_ISO_2022_KR; break;
+ case C_TIS_620: branch = "Menu/Options/Encoding/Thai/" CS_TIS_620; break;
+ case C_WINDOWS_874: branch = "Menu/Options/Encoding/Thai/" CS_WINDOWS_874; break;
+ default: branch = "Menu/Options/Encoding/" CS_AUTO; break;
+ }
+ cm_toggle_menu_set_active_full(compose->ui_manager, (gchar *)branch, TRUE);
}
static void compose_set_template_menu(Compose *compose)
menu = gtk_menu_new();
+ gtk_menu_set_accel_group (GTK_MENU (menu),
+ gtk_ui_manager_get_accel_group(compose->ui_manager));
for (cur = tmpl_list; cur != NULL; cur = cur->next) {
Template *tmpl = (Template *)cur->data;
-
+ gchar *accel_path = NULL;
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",
compose);
g_object_set_data(G_OBJECT(item), "template", tmpl);
gtk_widget_show(item);
+ accel_path = g_strconcat("<ComposeTemplates>" , "/", tmpl->name, NULL);
+ gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
+ g_free(accel_path);
}
gtk_widget_show(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);
+ action_update_compose_menu(compose->ui_manager, "/Menu/Tools/Actions", compose);
}
static void compose_update_privacy_systems_menu(Compose *compose)
{
- static gchar *branch_path = "/Options/Privacy System";
- GtkItemFactory *ifactory;
- GtkWidget *menuitem;
+ static gchar *branch_path = "/Menu/Options/PrivacySystem";
GSList *systems, *cur;
- GList *amenu;
GtkWidget *widget;
GtkWidget *system_none;
GSList *group;
+ GtkWidget *privacy_menuitem = gtk_ui_manager_get_widget(compose->ui_manager, branch_path);
+ GtkWidget *privacy_menu = gtk_menu_new();
- ifactory = gtk_item_factory_from_widget(compose->menubar);
-
- /* remove old entries */
- 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;
- }
-
- system_none = gtk_item_factory_get_widget(ifactory,
- "/Options/Privacy System/None");
+ system_none = gtk_radio_menu_item_new_with_mnemonic(NULL, _("_None"));
+ g_object_set_data_full(G_OBJECT(system_none), "privacy_system", NULL, NULL);
g_signal_connect(G_OBJECT(system_none), "activate",
G_CALLBACK(compose_set_privacy_system_cb), compose);
+ gtk_menu_shell_append(GTK_MENU_SHELL(privacy_menu), system_none);
+ gtk_widget_show(system_none);
+
systems = privacy_get_system_ids();
for (cur = systems; cur != NULL; cur = g_slist_next(cur)) {
gchar *systemid = cur->data;
g_signal_connect(G_OBJECT(widget), "activate",
G_CALLBACK(compose_set_privacy_system_cb), compose);
- gtk_menu_append(GTK_MENU(system_none->parent), widget);
+ gtk_menu_shell_append(GTK_MENU_SHELL(privacy_menu), widget);
gtk_widget_show(widget);
g_free(systemid);
}
g_slist_free(systems);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(privacy_menuitem), privacy_menu);
+ gtk_widget_show_all(privacy_menu);
+ gtk_widget_show_all(privacy_menuitem);
}
void compose_reflect_prefs_all(void)
msginfo = dummyinfo;
}
+ if (tmpl->from && *tmpl->from != '\0') {
+#ifdef USE_ENCHANT
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE,
+ compose->gtkaspell);
+#else
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE);
+#endif
+ quote_fmt_scan_string(tmpl->from);
+ quote_fmt_parse();
+
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Template From format error."));
+ } else {
+ gtk_entry_set_text(GTK_ENTRY(compose->from_name), buf);
+ }
+ }
+
if (tmpl->to && *tmpl->to != '\0') {
-#ifdef USE_ASPELL
- quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+#ifdef USE_ENCHANT
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE,
compose->gtkaspell);
#else
- quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE);
#endif
quote_fmt_scan_string(tmpl->to);
quote_fmt_parse();
}
if (tmpl->cc && *tmpl->cc != '\0') {
-#ifdef USE_ASPELL
- quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+#ifdef USE_ENCHANT
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE,
compose->gtkaspell);
#else
- quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE);
#endif
quote_fmt_scan_string(tmpl->cc);
quote_fmt_parse();
}
if (tmpl->bcc && *tmpl->bcc != '\0') {
-#ifdef USE_ASPELL
- quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+#ifdef USE_ENCHANT
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE,
compose->gtkaspell);
#else
- quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE);
#endif
quote_fmt_scan_string(tmpl->bcc);
quote_fmt_parse();
/* process the subject */
if (tmpl->subject && *tmpl->subject != '\0') {
-#ifdef USE_ASPELL
- quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account,
+#ifdef USE_ENCHANT
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE,
compose->gtkaspell);
#else
- quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account);
+ quote_fmt_init(msginfo, NULL, NULL, FALSE, compose->account, FALSE);
#endif
quote_fmt_scan_string(tmpl->subject);
quote_fmt_parse();
if (addressbook_get_target_compose() == compose)
addressbook_set_target_compose(NULL);
-#if USE_ASPELL
+#if USE_ENCHANT
if (compose->gtkaspell) {
gtkaspell_delete(compose->gtkaspell);
compose->gtkaspell = NULL;
}
#endif
- prefs_common.compose_width = compose->scrolledwin->allocation.width;
- prefs_common.compose_height = compose->window->allocation.height;
+ if (!compose->batch) {
+ prefs_common.compose_width = compose->scrolledwin->allocation.width;
+ prefs_common.compose_height = compose->window->allocation.height;
+ }
if (!gtk_widget_get_parent(compose->paned))
gtk_widget_destroy(compose->paned);
g_free(text);
}
-static void compose_attach_remove_selected(Compose *compose)
+static void compose_attach_remove_selected(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
GtkTreeSelection *selection;
GList *sel, *cur;
gtk_tree_path_free((GtkTreePath *)ptr);
}
-static void compose_attach_property(Compose *compose)
+static void compose_attach_property(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
GtkTreeView *tree_view = GTK_TREE_VIEW(compose->attach_clist);
AttachInfo *ainfo;
GtkComboBox *optmenu;
ainfo->file = file;
}
if (size)
- ainfo->size = size;
+ ainfo->size = (goffset)size;
/* update tree store */
text = to_human_readable(ainfo->size);
}
g_list_free(strlist);
gtk_combo_box_set_active(GTK_COMBO_BOX(mimetype_entry), 0);
- mimetype_entry = GTK_BIN(mimetype_entry)->child;
+ mimetype_entry = gtk_bin_get_child(GTK_BIN((mimetype_entry)));
label = gtk_label_new(_("Encoding"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,
compose_set_ext_editor_sensitive(compose, FALSE);
+#ifndef G_OS_WIN32
compose->exteditor_ch = g_io_channel_unix_new(pipe_fds[0]);
+#else
+ compose->exteditor_ch = g_io_channel_win32_new_fd(pipe_fds[0]);
+#endif
compose->exteditor_tag = g_io_add_watch(compose->exteditor_ch,
G_IO_IN,
compose_input_cb,
if (setpgid(0, getppid()))
perror("setpgid");
- if (prefs_common.ext_editor_cmd &&
- (p = strchr(prefs_common.ext_editor_cmd, '%')) &&
+ if (prefs_common_get_ext_editor_cmd() &&
+ (p = strchr(prefs_common_get_ext_editor_cmd(), '%')) &&
*(p + 1) == 's' && !strchr(p + 2, '%')) {
- g_snprintf(buf, sizeof(buf), prefs_common.ext_editor_cmd, file);
+ g_snprintf(buf, sizeof(buf), prefs_common_get_ext_editor_cmd(), file);
} else {
- if (prefs_common.ext_editor_cmd)
+ if (prefs_common_get_ext_editor_cmd())
g_warning("External editor command line is invalid: '%s'\n",
- prefs_common.ext_editor_cmd);
+ prefs_common_get_ext_editor_cmd());
g_snprintf(buf, sizeof(buf), DEFAULT_EDITOR_CMD, file);
}
compose_insert_file(compose, compose->exteditor_file);
compose_changed_cb(NULL, compose);
- if (g_unlink(compose->exteditor_file) < 0)
+ if (claws_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 (g_unlink(compose->exteditor_file) < 0)
+ if (claws_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");
static void compose_set_ext_editor_sensitive(Compose *compose,
gboolean sensitive)
{
- GtkItemFactory *ifactory;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
-
- menu_set_sensitive(ifactory, "/Message/Send", sensitive);
- menu_set_sensitive(ifactory, "/Message/Send later", 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",
- sensitive);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/Send", sensitive);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/SendLater", sensitive);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/InsertFile", sensitive);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message/InsertSig", sensitive);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/WrapPara", sensitive);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/WrapAllLines", sensitive);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/ExtEditor", sensitive);
gtk_widget_set_sensitive(compose->text, sensitive);
if (compose->toolbar->send_btn)
static void compose_undo_state_changed(UndoMain *undostruct, gint undo_state,
gint redo_state, gpointer data)
{
- GtkWidget *widget = GTK_WIDGET(data);
- GtkItemFactory *ifactory;
-
- g_return_if_fail(widget != NULL);
-
- ifactory = gtk_item_factory_from_widget(widget);
+ Compose *compose = (Compose *)data;
switch (undo_state) {
case UNDO_STATE_TRUE:
if (!undostruct->undo_state) {
undostruct->undo_state = TRUE;
- menu_set_sensitive(ifactory, "/Edit/Undo", TRUE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Undo", TRUE);
}
break;
case UNDO_STATE_FALSE:
if (undostruct->undo_state) {
undostruct->undo_state = FALSE;
- menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Undo", FALSE);
}
break;
case UNDO_STATE_UNCHANGED:
break;
case UNDO_STATE_REFRESH:
- menu_set_sensitive(ifactory, "/Edit/Undo",
- undostruct->undo_state);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Undo", undostruct->undo_state);
break;
default:
g_warning("Undo state not recognized");
case UNDO_STATE_TRUE:
if (!undostruct->redo_state) {
undostruct->redo_state = TRUE;
- menu_set_sensitive(ifactory, "/Edit/Redo", TRUE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Redo", TRUE);
}
break;
case UNDO_STATE_FALSE:
if (undostruct->redo_state) {
undostruct->redo_state = FALSE;
- menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Redo", FALSE);
}
break;
case UNDO_STATE_UNCHANGED:
break;
case UNDO_STATE_REFRESH:
- menu_set_sensitive(ifactory, "/Edit/Redo",
- undostruct->redo_state);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit/Redo", undostruct->redo_state);
break;
default:
g_warning("Redo state not recognized");
static void attach_selected(GtkTreeView *tree_view, GtkTreePath *tree_path,
GtkTreeViewColumn *column, Compose *compose)
{
- compose_attach_property(compose);
+ compose_attach_property(NULL, compose);
}
static gboolean attach_button_pressed(GtkWidget *widget, GdkEventButton *event,
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);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Remove", TRUE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", TRUE);
} else {
- menu_set_sensitive(ifactory, "/Remove", FALSE);
- menu_set_sensitive(ifactory, "/Properties...", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Remove", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Popup/Compose/Properties", FALSE);
}
gtk_menu_popup(GTK_MENU(compose->popupmenu), NULL, NULL,
switch (event->keyval) {
case GDK_Delete:
- compose_attach_remove_selected(compose);
+ compose_attach_remove_selected(NULL, 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, "/Message", allow);
- menu_set_sensitive(ifactory, "/Edit", allow);
-#if USE_ASPELL
- menu_set_sensitive(ifactory, "/Spelling", allow);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Message", allow);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Edit", allow);
+#if USE_ENCHANT
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Spelling", allow);
#endif
- menu_set_sensitive(ifactory, "/Options", allow);
- menu_set_sensitive(ifactory, "/Tools", allow);
- menu_set_sensitive(ifactory, "/Help", allow);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Options", allow);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Tools", allow);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Help", allow);
gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), allow);
}
-static void compose_send_cb(gpointer data, guint action, GtkWidget *widget)
+static void compose_send_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
compose_send(compose);
}
-static void compose_send_later_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_send_later_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
gint val;
{
gchar *filepath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
DRAFTED_AT_EXIT, NULL);
- FILE *fp = fopen(filepath, "ab");
+ FILE *fp = g_fopen(filepath, "ab");
if (fp) {
fprintf(fp, "%s\t%d\n", folder_item_get_identifier(info->folder),
g_free(folderid);
}
+ err |= (fprintf(fp, "X-Claws-Auto-Wrapping:%d\n", compose->autowrap) < 0);
+ err |= (fprintf(fp, "X-Claws-Auto-Indent:%d\n", compose->autoindent) < 0);
+
/* end of headers */
err |= (fprintf(fp, "X-Claws-End-Special-Headers: 1\n") < 0);
}
if (msgnum < 0) {
warn_err:
- g_unlink(tmp);
+ claws_unlink(tmp);
g_free(tmp);
if (action != COMPOSE_AUTO_SAVE) {
if (action != COMPOSE_DRAFT_FOR_EXIT)
procmsg_msginfo_free(compose->targetinfo);
compose->targetinfo = procmsg_msginfo_new();
compose->targetinfo->msgnum = msgnum;
- compose->targetinfo->size = s.st_size;
+ compose->targetinfo->size = (goffset)s.st_size;
compose->targetinfo->mtime = s.st_mtime;
compose->targetinfo->folder = draft;
if (target_locked)
gchar *filepath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
DRAFTED_AT_EXIT, NULL);
if (is_file_exist(filepath))
- g_unlink(filepath);
+ claws_unlink(filepath);
g_free(filepath);
}
{
gchar *filepath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
DRAFTED_AT_EXIT, NULL);
- FILE *fp = fopen(filepath, "rb");
+ FILE *fp = g_fopen(filepath, "rb");
gchar buf[1024];
if (fp) {
compose_clear_exit_drafts();
}
-static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
+static void compose_save_cb(GtkAction *action, gpointer data)
{
- compose_draft(data, action);
+ compose_draft(data, COMPOSE_KEEP_EDITING);
}
static void compose_attach_from_list(Compose *compose, GList *file_list, gboolean free_data)
}
}
-static void compose_attach_cb(gpointer data, guint action, GtkWidget *widget)
+static void compose_attach_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
GList *file_list;
}
}
-static void compose_insert_file_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_insert_file_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
GList *file_list;
}
}
-static void compose_insert_sig_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_insert_sig_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
Compose *compose = (Compose *)data;
gtkut_widget_get_uposition(widget, &x, &y);
- prefs_common.compose_x = x;
- prefs_common.compose_y = y;
-
+ if (!compose->batch) {
+ prefs_common.compose_x = x;
+ prefs_common.compose_y = y;
+ }
if (compose->sending || compose->updating)
return TRUE;
- compose_close_cb(compose, 0, NULL);
+ compose_close_cb(NULL, compose);
return TRUE;
}
void compose_close_toolbar(Compose *compose)
{
- compose_close_cb(compose, 0, NULL);
+ compose_close_cb(NULL, compose);
}
-static void compose_close_cb(gpointer data, guint action, GtkWidget *widget)
+static void compose_close_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
AlertValue val;
#endif
if (compose->modified) {
- val = alertpanel(_("Discard message"),
+ gboolean reedit = (compose->rmode == COMPOSE_REEDIT);
+ 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;
+ }
+ if (!reedit) {
+ val = alertpanel(_("Discard message"),
_("This message has been modified. Discard it?"),
_("_Discard"), _("_Save to Drafts"), GTK_STOCK_CANCEL);
-
+ } else {
+ val = alertpanel(_("Save changes"),
+ _("This message has been modified. Save the latest changes?"),
+ _("_Don't save"), _("+_Save to Drafts"), GTK_STOCK_CANCEL);
+ }
+ g_mutex_unlock(compose->mutex);
switch (val) {
case G_ALERTDEFAULT:
- if (prefs_common.autosave)
+ if (prefs_common.autosave && !reedit)
compose_remove_draft(compose);
break;
case G_ALERTALTERNATE:
- compose_draft_cb(data, COMPOSE_QUIT_EDITING, NULL);
+ compose_draft(data, COMPOSE_QUIT_EDITING);
return;
default:
return;
compose_close(compose);
}
-static void compose_set_encoding_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_set_encoding_cb(GtkAction *action, GtkRadioAction *current, gpointer data)
{
- Compose *compose = (Compose *)data;
+ gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
+ gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
+ Compose *compose = (Compose *) data;
- if (GTK_CHECK_MENU_ITEM(widget)->active)
- compose->out_encoding = (CharSet)action;
+ if (active)
+ compose->out_encoding = (CharSet)value;
}
-static void compose_address_cb(gpointer data, guint action, GtkWidget *widget)
+static void compose_address_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
addressbook_open(compose);
}
+static void about_show_cb(GtkAction *action, gpointer data)
+{
+ about_show();
+}
+
static void compose_template_activate_cb(GtkWidget *widget, gpointer data)
{
Compose *compose = (Compose *)data;
compose_template_apply(compose, tmpl, FALSE);
}
-static void compose_ext_editor_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_ext_editor_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
compose_exec_ext_editor(compose);
}
-static void compose_undo_cb(Compose *compose)
+static void compose_undo_cb(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
gboolean prev_autowrap = compose->autowrap;
compose->autowrap = FALSE;
compose->autowrap = prev_autowrap;
}
-static void compose_redo_cb(Compose *compose)
+static void compose_redo_cb(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
gboolean prev_autowrap = compose->autowrap;
compose->autowrap = FALSE;
if (contents == NULL)
return;
-
- undo_paste_clipboard(GTK_TEXT_VIEW(compose->text), compose->undostruct);
-
+
/* we shouldn't delete the selection when middle-click-pasting, or we
* can't mid-click-paste our own selection */
if (clip != GDK_SELECTION_PRIMARY) {
+ undo_paste_clipboard(GTK_TEXT_VIEW(compose->text), compose->undostruct);
gtk_text_buffer_delete_selection(buffer, FALSE, TRUE);
}
}
} else if (GTK_IS_EDITABLE(entry))
gtk_editable_paste_clipboard (GTK_EDITABLE(entry));
-
+
+ compose->modified = TRUE;
}
static void entry_allsel(GtkWidget *entry)
}
}
-static void compose_cut_cb(Compose *compose)
+static void compose_cut_cb(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
if (compose->focused_editable
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
&& GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
#endif
)
entry_cut_clipboard(compose->focused_editable);
}
-static void compose_copy_cb(Compose *compose)
+static void compose_copy_cb(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
if (compose->focused_editable
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
&& GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
#endif
)
entry_copy_clipboard(compose->focused_editable);
}
-static void compose_paste_cb(Compose *compose)
+static void compose_paste_cb(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
gint prev_autowrap;
GtkTextBuffer *buffer;
BLOCK_WRAP();
UNBLOCK_WRAP();
}
-static void compose_paste_as_quote_cb(Compose *compose)
+static void compose_paste_as_quote_cb(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
gint wrap_quote = prefs_common.linewrap_quote;
if (compose->focused_editable
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
&& GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
#endif
) {
}
}
-static void compose_paste_no_wrap_cb(Compose *compose)
+static void compose_paste_no_wrap_cb(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
gint prev_autowrap;
GtkTextBuffer *buffer;
BLOCK_WRAP();
if (compose->focused_editable
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
&& GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
#endif
)
UNBLOCK_WRAP();
}
-static void compose_paste_wrap_cb(Compose *compose)
+static void compose_paste_wrap_cb(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
gint prev_autowrap;
GtkTextBuffer *buffer;
BLOCK_WRAP();
if (compose->focused_editable
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
&& GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
#endif
)
UNBLOCK_WRAP();
}
-static void compose_allsel_cb(Compose *compose)
+static void compose_allsel_cb(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
if (compose->focused_editable
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
&& GTK_WIDGET_HAS_FOCUS(compose->focused_editable)
#endif
)
GtkTextBuffer *buffer;
GtkTextMark *mark;
GtkTextIter ins, start_iter, end_iter;
- gboolean found;
g_return_if_fail(GTK_IS_TEXT_VIEW(text));
gtk_text_iter_set_line_offset(&start_iter, 0);
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);
+ if (gtk_text_iter_ends_line(&end_iter)){
+ if (!gtk_text_iter_forward_char(&end_iter))
+ gtk_text_iter_backward_char(&start_iter);
+ }
+ else
+ gtk_text_iter_forward_to_line_end(&end_iter);
+ 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;
g_return_if_fail(GTK_IS_TEXT_VIEW(text));
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);
+ 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);
+ gtk_text_iter_forward_to_line_end(&end_iter);
+ gtk_text_buffer_delete(buffer, &ins, &end_iter);
+}
+
+#define DO_ACTION(name, act) { \
+ if(!strcmp(name, a_name)) { \
+ return act; \
+ } \
+}
+static ComposeCallAdvancedAction compose_call_advanced_action_from_path(GtkAction *action)
+{
+ const gchar *a_name = gtk_action_get_name(action);
+ DO_ACTION("Edit/Advanced/BackChar", COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER);
+ DO_ACTION("Edit/Advanced/ForwChar", COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER);
+ DO_ACTION("Edit/Advanced/BackWord", COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_WORD);
+ DO_ACTION("Edit/Advanced/ForwWord", COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_WORD);
+ DO_ACTION("Edit/Advanced/BegLine", COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE);
+ DO_ACTION("Edit/Advanced/EndLine", COMPOSE_CALL_ADVANCED_ACTION_MOVE_END_OF_LINE);
+ DO_ACTION("Edit/Advanced/PrevLine", COMPOSE_CALL_ADVANCED_ACTION_MOVE_PREVIOUS_LINE);
+ DO_ACTION("Edit/Advanced/NextLine", COMPOSE_CALL_ADVANCED_ACTION_MOVE_NEXT_LINE);
+ DO_ACTION("Edit/Advanced/DelBackChar", COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_CHARACTER);
+ DO_ACTION("Edit/Advanced/DelForwChar", COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_CHARACTER);
+ DO_ACTION("Edit/Advanced/DelBackWord", COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD);
+ DO_ACTION("Edit/Advanced/DelForwWord", COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD);
+ DO_ACTION("Edit/Advanced/DelLine", COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE);
+ DO_ACTION("Edit/Advanced/DelEndLine", COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END);
+ return -1;
}
-static void compose_advanced_action_cb(Compose *compose,
- ComposeCallAdvancedAction action)
+static void compose_advanced_action_cb(GtkAction *gaction, gpointer data)
{
+ Compose *compose = (Compose *)data;
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ ComposeCallAdvancedAction action = -1;
+
+ action = compose_call_advanced_action_from_path(gaction);
+
static struct {
void (*do_action) (GtkTextView *text);
} action_table[] = {
{textview_delete_forward_word},
{textview_delete_backward_word},
{textview_delete_line},
- {NULL}, /* gtk_stext_delete_line_n */
{textview_delete_to_line_end}
};
if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
compose->focused_editable = widget;
-#ifdef MAEMO
+#ifdef GENERIC_UMPC
if (GTK_IS_TEXT_VIEW(widget)
&& gtk_paned_get_child1(GTK_PANED(compose->paned)) != compose->edit_vbox) {
- gtk_widget_ref(compose->notebook);
- gtk_widget_ref(compose->edit_vbox);
+ g_object_ref(compose->notebook);
+ g_object_ref(compose->edit_vbox);
gtk_container_remove(GTK_CONTAINER(compose->paned), compose->notebook);
gtk_container_remove(GTK_CONTAINER(compose->paned), compose->edit_vbox);
gtk_paned_add1(GTK_PANED(compose->paned), compose->edit_vbox);
gtk_paned_add2(GTK_PANED(compose->paned), compose->notebook);
- gtk_widget_unref(compose->notebook);
- gtk_widget_unref(compose->edit_vbox);
+ g_object_unref(compose->notebook);
+ g_object_unref(compose->edit_vbox);
g_signal_handlers_block_by_func(G_OBJECT(widget),
G_CALLBACK(compose_grab_focus_cb),
compose);
compose);
} else if (!GTK_IS_TEXT_VIEW(widget)
&& gtk_paned_get_child1(GTK_PANED(compose->paned)) != compose->notebook) {
- gtk_widget_ref(compose->notebook);
- gtk_widget_ref(compose->edit_vbox);
+ g_object_ref(compose->notebook);
+ g_object_ref(compose->edit_vbox);
gtk_container_remove(GTK_CONTAINER(compose->paned), compose->notebook);
gtk_container_remove(GTK_CONTAINER(compose->paned), compose->edit_vbox);
gtk_paned_add1(GTK_PANED(compose->paned), compose->notebook);
gtk_paned_add2(GTK_PANED(compose->paned), compose->edit_vbox);
- gtk_widget_unref(compose->notebook);
- gtk_widget_unref(compose->edit_vbox);
+ g_object_unref(compose->notebook);
+ g_object_unref(compose->edit_vbox);
g_signal_handlers_block_by_func(G_OBJECT(widget),
G_CALLBACK(compose_grab_focus_cb),
compose);
static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
{
compose->modified = TRUE;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
compose_set_title(compose);
#endif
}
-static void compose_wrap_cb(gpointer data, guint action, GtkWidget *widget)
+static void compose_wrap_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
+ compose_beautify_paragraph(compose, NULL, TRUE);
+}
- if (action == 1)
- compose_wrap_all_full(compose, TRUE);
- else
- compose_beautify_paragraph(compose, NULL, TRUE);
+static void compose_wrap_all_cb(GtkAction *action, gpointer data)
+{
+ Compose *compose = (Compose *)data;
+ compose_wrap_all_full(compose, TRUE);
}
-static void compose_find_cb(gpointer data, guint action, GtkWidget *widget)
+static void compose_find_cb(GtkAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
message_search_compose(compose);
}
-static void compose_toggle_autowrap_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_toggle_autowrap_cb(GtkToggleAction *action,
+ gpointer data)
{
Compose *compose = (Compose *)data;
- compose->autowrap = GTK_CHECK_MENU_ITEM(widget)->active;
+ compose->autowrap = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
if (compose->autowrap)
compose_wrap_all_full(compose, TRUE);
- compose->autowrap = GTK_CHECK_MENU_ITEM(widget)->active;
+ compose->autowrap = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
}
-static void compose_toggle_sign_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_toggle_autoindent_cb(GtkToggleAction *action,
+ gpointer data)
{
Compose *compose = (Compose *)data;
+ compose->autoindent = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
+}
- if (GTK_CHECK_MENU_ITEM(widget)->active)
- compose->use_signing = TRUE;
- else
- compose->use_signing = FALSE;
+static void compose_toggle_sign_cb(GtkToggleAction *action, gpointer data)
+{
+ Compose *compose = (Compose *)data;
+
+ compose->use_signing = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
}
-static void compose_toggle_encrypt_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_toggle_encrypt_cb(GtkToggleAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
- if (GTK_CHECK_MENU_ITEM(widget)->active)
- compose->use_encryption = TRUE;
- else
- compose->use_encryption = FALSE;
+ compose->use_encryption = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
}
static void activate_privacy_system(Compose *compose, PrefsAccount *account, gboolean warn)
compose_update_privacy_system_menu_item(compose, warn);
}
-static void compose_toggle_ruler_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_toggle_ruler_cb(GtkToggleAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
gtk_widget_show(compose->ruler_hbox);
prefs_common.show_ruler = TRUE;
} else {
if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
AlertValue val = G_ALERTDEFAULT;
+ list = uri_list_extract_filenames((const gchar *)data->data);
+
+ if (list == NULL && strstr((gchar *)(data->data), "://")) {
+ /* Assume a list of no files, and data has ://, is a remote link */
+ gchar *tmpdata = g_strstrip(g_strdup((const gchar *)data->data));
+ gchar *tmpfile = get_tmp_file();
+ str_write_to_file(tmpdata, tmpfile);
+ g_free(tmpdata);
+ compose_insert_file(compose, tmpfile);
+ claws_unlink(tmpfile);
+ g_free(tmpfile);
+ gtk_drag_finish(drag_context, TRUE, FALSE, time);
+ compose_beautify_paragraph(compose, NULL, TRUE);
+ return;
+ }
switch (prefs_common.compose_dnd_mode) {
case COMPOSE_DND_ASK:
val = alertpanel_full(_("Insert or attach?"),
if (val == G_ALERTDEFAULT || val == G_ALERTCANCEL) {
gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ list_free_strings(list);
+ g_list_free(list);
return;
} else if (val == G_ALERTOTHER) {
compose_attach_drag_received_cb(widget, drag_context, x, y, data, info, time, user_data);
+ list_free_strings(list);
+ g_list_free(list);
return;
}
- list = uri_list_extract_filenames((const gchar *)data->data);
+
for (tmp = list; tmp != NULL; tmp = tmp->next) {
compose_insert_file(compose, (const gchar *)tmp->data);
}
gchar *tmpfile = get_tmp_file();
str_write_to_file((const gchar *)data->data, tmpfile);
compose_insert_file(compose, tmpfile);
- g_unlink(tmpfile);
+ claws_unlink(tmpfile);
g_free(tmpfile);
gtk_drag_finish(drag_context, TRUE, FALSE, time);
#endif
gtk_drag_finish(drag_context, TRUE, FALSE, time);
}
-static void compose_toggle_return_receipt_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_toggle_return_receipt_cb(GtkToggleAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
- if (GTK_CHECK_MENU_ITEM(widget)->active)
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
compose->return_receipt = TRUE;
else
compose->return_receipt = FALSE;
}
-static void compose_toggle_remove_refs_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void compose_toggle_remove_refs_cb(GtkToggleAction *action, gpointer data)
{
Compose *compose = (Compose *)data;
- if (GTK_CHECK_MENU_ITEM(widget)->active)
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
compose->remove_references = TRUE;
else
compose->remove_references = FALSE;
gtk_text_buffer_delete_mark(buffer, mark);
} else {
if (strcmp(text, "\n") || compose->automatic_break
- || gtk_text_iter_starts_line(iter))
+ || gtk_text_iter_starts_line(iter)) {
+ GtkTextIter before_ins;
gtk_text_buffer_insert(buffer, iter, text, len);
- else {
- debug_print("insert nowrap \\n\n");
- gtk_text_buffer_insert_with_tags_by_name(buffer,
- iter, text, len, "no_join", NULL);
+ if (!strstr(text, "\n") && gtk_text_iter_has_tag(iter, compose->no_join_tag)) {
+ before_ins = *iter;
+ gtk_text_iter_backward_chars(&before_ins, len);
+ gtk_text_buffer_remove_tag_by_name(buffer, "no_join", &before_ins, iter);
+ }
+ } else {
+ /* check if the preceding is just whitespace or quote */
+ GtkTextIter start_line;
+ gchar *tmp = NULL, *quote = NULL;
+ gint quote_len = 0, is_normal = 0;
+ start_line = *iter;
+ gtk_text_iter_set_line_offset(&start_line, 0);
+ tmp = gtk_text_buffer_get_text(buffer, &start_line, iter, FALSE);
+ g_strstrip(tmp);
+
+ if (*tmp == '\0') {
+ is_normal = 1;
+ } else {
+ quote = compose_get_quote_str(buffer, &start_line, "e_len);
+ if (quote)
+ is_normal = 1;
+ g_free(quote);
+ }
+ g_free(tmp);
+
+ if (is_normal) {
+ gtk_text_buffer_insert(buffer, iter, text, len);
+ } else {
+ gtk_text_buffer_insert_with_tags_by_name(buffer,
+ iter, text, len, "no_join", NULL);
+ }
}
}
static gint compose_defer_auto_save_draft(Compose *compose)
{
compose->draft_timeout_tag = -1;
- compose_draft_cb((gpointer)compose, COMPOSE_AUTO_SAVE, NULL);
+ compose_draft((gpointer)compose, COMPOSE_AUTO_SAVE);
return FALSE;
}
-#if USE_ASPELL
-static void compose_check_all(Compose *compose)
+#if USE_ENCHANT
+static void compose_check_all(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
if (compose->gtkaspell)
gtkaspell_check_all(compose->gtkaspell);
}
-static void compose_highlight_all(Compose *compose)
+static void compose_highlight_all(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
if (compose->gtkaspell)
gtkaspell_highlight_all(compose->gtkaspell);
}
-static void compose_check_backwards(Compose *compose)
+static void compose_check_backwards(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
if (compose->gtkaspell)
gtkaspell_check_backwards(compose->gtkaspell);
else {
- GtkItemFactory *ifactory;
- ifactory = gtk_item_factory_from_widget(compose->popupmenu);
- menu_set_sensitive(ifactory, "/Edit/Check backwards misspelled word", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Forward to next misspelled word", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Spelling", FALSE);
}
}
-static void compose_check_forwards_go(Compose *compose)
+static void compose_check_forwards_go(GtkAction *action, gpointer data)
{
+ Compose *compose = (Compose *)data;
if (compose->gtkaspell)
gtkaspell_check_forwards_go(compose->gtkaspell);
else {
- GtkItemFactory *ifactory;
- ifactory = gtk_item_factory_from_widget(compose->popupmenu);
- menu_set_sensitive(ifactory, "/Edit/Check backwards misspelled word", FALSE);
- menu_set_sensitive(ifactory, "/Edit/Forward to next misspelled word", FALSE);
+ cm_menu_set_sensitive_full(compose->ui_manager, "Menu/Spelling", FALSE);
}
}
#endif
gchar *to;
Xstrdup_a(to, msginfo->to, return NULL);
extract_address(to);
- account = account_find_from_address(to);
+ account = account_find_from_address(to, FALSE);
}
if (!account && prefs_common.forward_account_autosel) {
(msginfo, cc,sizeof cc , "Cc:")) {
gchar *buf = cc + strlen("Cc:");
extract_address(buf);
- account = account_find_from_address(buf);
+ account = account_find_from_address(buf, FALSE);
}
}
(msginfo, deliveredto,sizeof deliveredto , "Delivered-To:")) {
gchar *buf = deliveredto + strlen("Delivered-To:");
extract_address(buf);
- account = account_find_from_address(buf);
+ account = account_find_from_address(buf, 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;
+ if (!compose->batch) {
+ prefs_common.compose_x = x;
+ prefs_common.compose_y = y;
+ }
g_mutex_unlock(compose->mutex);
compose_destroy(compose);
return FALSE;
GSList *new_msglist = NULL;
MsgInfo *tmp_msginfo = NULL;
gboolean originally_enc = FALSE;
+ gboolean originally_sig = FALSE;
Compose *compose = NULL;
g_return_if_fail(msgview != NULL);
new_msglist = g_slist_append(NULL, tmp_msginfo);
originally_enc = MSG_IS_ENCRYPTED(orig_msginfo->flags);
+ privacy_msginfo_get_signed_state(orig_msginfo);
+ originally_sig = MSG_IS_SIGNED(orig_msginfo->flags);
+
tmp_msginfo->folder = orig_msginfo->folder;
tmp_msginfo->msgnum = orig_msginfo->msgnum;
if (orig_msginfo->tags)
compose_force_encryption(compose, compose->account, FALSE);
}
+ if (compose && originally_sig && compose->account->default_sign_reply) {
+ compose_force_signing(compose, compose->account);
+ }
+
g_free(body);
}
for (list = compose->header_list; list; list = list->next) {
gchar *header = gtk_editable_get_chars(
GTK_EDITABLE(
- GTK_BIN(((ComposeHeaderEntry *)list->data)->combo)->child), 0, -1);
+ gtk_bin_get_child(GTK_BIN((((ComposeHeaderEntry *)list->data)->combo)))), 0, -1);
gchar *entry = gtk_editable_get_chars(
GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
return newmsginfo;
}
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
/* update compose's dictionaries from folder dict settings */
static void compose_set_dictionaries_from_folder_prefs(Compose *compose,
FolderItem *folder_item)
projects / claws.git / blobdiff