/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#include "defs.h"
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
+#include <gtk/gtk.h>
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include "filesel.h"
#include "foldersel.h"
#include "sourcewindow.h"
-#include "addressbook.h"
#include "alertpanel.h"
#include "inputdialog.h"
#include "mainwindow.h"
#include "hooks.h"
#include "filtering.h"
#include "partial_download.h"
-#include "gedit-print.h"
#include "uri_opener.h"
#include "inc.h"
#include "log.h"
+#include "privacy.h"
#include "combobox.h"
#include "printing.h"
#include "quoted-printable.h"
#include "version.h"
-
+#include "statusbar.h"
+#include "folder_item_prefs.h"
+#include "avatars.h"
+#ifndef USE_ALT_ADDRBOOK
+ #include "addressbook.h"
+#else
+ #include "addressadd.h"
+ #include "addressbook-dbus.h"
+#endif
static GList *messageview_list = NULL;
static gint messageview_delete_cb (GtkWidget *widget,
MessageView *messageview);
static void messageview_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation);
-#ifndef MAEMO
static gboolean key_pressed (GtkWidget *widget,
GdkEventKey *event,
MessageView *messageview);
-#endif
static void return_receipt_show (NoticeView *noticeview,
MsgInfo *msginfo);
static void return_receipt_send_clicked (NoticeView *noticeview,
MsgInfo *msginfo);
static void partial_recv_unmark_clicked (NoticeView *noticeview,
MsgInfo *msginfo);
-static void save_as_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
-static void page_setup_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-#endif
-static void print_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void close_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void copy_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void allsel_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void search_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void prev_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void next_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void prev_unread_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void next_unread_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void prev_new_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void next_new_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void prev_marked_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void next_marked_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void prev_labeled_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void next_labeled_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void last_read_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void parent_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void goto_unread_folder_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void goto_folder_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void set_charset_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void set_decode_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void view_source_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void show_all_header_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void msg_hide_quotes_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void compose_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void reply_cb (gpointer data,
- guint action,
- GtkWidget *widget);
+static void save_as_cb (GtkAction *action,
+ gpointer data);
+static void page_setup_cb (GtkAction *action,
+ gpointer data);
+static void print_cb (GtkAction *action,
+ gpointer data);
+static void close_cb (GtkAction *action,
+ gpointer data);
+static void copy_cb (GtkAction *action,
+ gpointer data);
+static void allsel_cb (GtkAction *action,
+ gpointer data);
+static void search_cb (GtkAction *action,
+ gpointer data);
+
+static void prev_cb (GtkAction *action,
+ gpointer data);
+static void next_cb (GtkAction *action,
+ gpointer data);
+static void prev_unread_cb (GtkAction *action,
+ gpointer data);
+static void next_unread_cb (GtkAction *action,
+ gpointer data);
+static void prev_new_cb (GtkAction *action,
+ gpointer data);
+static void next_new_cb (GtkAction *action,
+ gpointer data);
+static void prev_marked_cb (GtkAction *action,
+ gpointer data);
+static void next_marked_cb (GtkAction *action,
+ gpointer data);
+static void prev_labeled_cb (GtkAction *action,
+ gpointer data);
+static void next_labeled_cb (GtkAction *action,
+ gpointer data);
+static void prev_history_cb (GtkAction *action,
+ gpointer data);
+static void next_history_cb (GtkAction *action,
+ gpointer data);
+static void parent_cb (GtkAction *action,
+ gpointer data);
+static void goto_unread_folder_cb (GtkAction *action,
+ gpointer data);
+static void goto_folder_cb (GtkAction *action,
+ gpointer data);
+
+static void scroll_prev_line_cb (GtkAction *action,
+ gpointer data);
+static void scroll_next_line_cb (GtkAction *action,
+ gpointer data);
+static void scroll_next_page_cb (GtkAction *action,
+ gpointer data);
+static void scroll_prev_page_cb (GtkAction *action,
+ gpointer data);
+
+static void set_charset_cb (GtkAction *action, GtkRadioAction *current, gpointer data);
+static void set_decode_cb (GtkAction *action, GtkRadioAction *current, gpointer data);
+
+static void view_source_cb (GtkAction *action,
+ gpointer data);
+
+static void show_all_header_cb (GtkToggleAction *action,
+ gpointer data);
+static void msg_hide_quotes_cb (GtkToggleAction *action,
+ gpointer data);
+
+static void compose_cb (GtkAction *action,
+ gpointer data);
+static void reply_cb (GtkAction *action,
+ gpointer data);
static PrefsAccount *select_account_from_list
(GList *ac_list);
-static void addressbook_open_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void add_address_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void create_filter_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void create_processing_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void open_urls_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-
-static void about_cb (gpointer data,
- guint action,
- GtkWidget *widget);
+static void addressbook_open_cb (GtkAction *action,
+ gpointer data);
+static void add_address_cb (GtkAction *action,
+ gpointer data);
+static void create_filter_cb (GtkAction *action,
+ gpointer data);
+static void create_processing_cb (GtkAction *action,
+ gpointer data);
+static void open_urls_cb (GtkAction *action,
+ gpointer data);
+
+static void about_cb (GtkAction *action,
+ gpointer data);
static void messageview_update (MessageView *msgview,
MsgInfo *old_msginfo);
static gboolean messageview_update_msg (gpointer source, gpointer data);
-static GList *msgview_list = NULL;
-static GtkItemFactoryEntry msgview_entries[] =
+static void save_part_as_cb(GtkAction *action, gpointer data);
+static void view_part_as_text_cb(GtkAction *action, gpointer data);
+static void open_part_cb(GtkAction *action, gpointer data);
+#ifndef G_OS_WIN32
+static void open_part_with_cb(GtkAction *action, gpointer data);
+#endif
+static void check_signature_cb(GtkAction *action, gpointer data);
+static void goto_next_part_cb(GtkAction *action, gpointer data);
+static void goto_prev_part_cb(GtkAction *action, gpointer data);
+
+static void messageview_nothing_cb (GtkAction *action, gpointer data)
{
- {N_("/_File"), NULL, NULL, 0, "<Branch>"},
- {N_("/_File/_Save as..."), "<control>S", save_as_cb, 0, NULL},
-#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
- {N_("/_File/Page setup..."), NULL, page_setup_cb, 0, NULL},
+
+}
+
+static GList *msgview_list = NULL;
+static GtkActionEntry msgview_entries[] =
+{
+ {"Menu", NULL, "Menu" },
+/* menus */
+ {"File", NULL, N_("_File") },
+ {"Edit", NULL, N_("_Edit") },
+ {"View", NULL, N_("_View") },
+ {"Message", NULL, N_("_Message") },
+ {"Tools", NULL, N_("_Tools") },
+ {"Help", NULL, N_("_Help") },
+ {"PlaceHolder", NULL, "Placeholder", NULL, NULL, G_CALLBACK(messageview_nothing_cb) },
+
+/* File menu */
+ {"File/SaveAs", NULL, N_("_Save email as..."), "<control>S", NULL, G_CALLBACK(save_as_cb) },
+ {"File/SavePartAs", NULL, N_("_Save part as..."), "Y", NULL, G_CALLBACK(save_part_as_cb) },
+ {"File/PageSetup", NULL, N_("Page setup..."), NULL, NULL, G_CALLBACK(page_setup_cb) },
+ {"File/Print", NULL, N_("_Print..."), "<control>P", NULL, G_CALLBACK(print_cb) },
+ {"File/---", NULL, "---", NULL, NULL, NULL },
+ {"File/Close", NULL, N_("_Close"), "<control>W", NULL, G_CALLBACK(close_cb) },
+
+/* Edit menu */
+ {"Edit/Copy", NULL, N_("_Copy"), "<control>C", NULL, G_CALLBACK(copy_cb) },
+ {"Edit/SelectAll", NULL, N_("_Select all"), "<control>A", NULL, G_CALLBACK(allsel_cb) },
+ {"Edit/---", NULL, "---", NULL, NULL, NULL },
+ {"Edit/Find", NULL, N_("_Find"), "<control>F", NULL, G_CALLBACK(search_cb) },
+
+/* View menu */
+ {"View/Goto", NULL, N_("_Go to") },
+ {"View/Goto/Prev", NULL, N_("_Previous message"), "P", NULL, G_CALLBACK(prev_cb) },
+ {"View/Goto/Next", NULL, N_("_Next message"), "N", NULL, G_CALLBACK(next_cb) },
+ {"View/Goto/---", NULL, "---", NULL, NULL, NULL },
+ {"View/Goto/PrevUnread", NULL, N_("P_revious unread message"), "<shift>P", NULL, G_CALLBACK(prev_unread_cb) },
+ {"View/Goto/NextUnread", NULL, N_("N_ext unread message"), "<shift>N", NULL, G_CALLBACK(next_unread_cb) },
+ /* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
+ {"View/Goto/PrevNew", NULL, N_("Previous ne_w message"), NULL, NULL, G_CALLBACK(prev_new_cb) },
+ {"View/Goto/NextNew", NULL, N_("Ne_xt new message"), NULL, NULL, G_CALLBACK(next_new_cb) },
+ /* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
+ {"View/Goto/PrevMarked", NULL, N_("Previous _marked message"), NULL, NULL, G_CALLBACK(prev_marked_cb) },
+ {"View/Goto/NextMarked", NULL, N_("Next m_arked message"), NULL, NULL, G_CALLBACK(next_marked_cb) },
+ /* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
+ {"View/Goto/PrevLabeled", NULL, N_("Previous _labeled message"), NULL, NULL, G_CALLBACK(prev_labeled_cb) },
+ {"View/Goto/NextLabeled", NULL, N_("Next la_beled message"), NULL, NULL, G_CALLBACK(next_labeled_cb) },
+ /* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
+ {"View/Goto/PrevHistory", NULL, N_("Previous opened message"), "<alt>Left", NULL, G_CALLBACK(prev_history_cb) },
+ {"View/Goto/NextHistory", NULL, N_("Next opened message"), "<alt>Right", NULL, G_CALLBACK(next_history_cb) },
+ /* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
+ {"View/Goto/ParentMessage", NULL, N_("Parent message"), "<control>Up", NULL, G_CALLBACK(parent_cb) },
+ /* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
+ {"View/Goto/NextUnreadFolder", NULL, N_("Next unread _folder"), "<shift>G", NULL, G_CALLBACK(goto_unread_folder_cb) },
+ {"View/Goto/Folder", NULL, N_("F_older..."), "G", NULL, G_CALLBACK(goto_folder_cb) },
+ /* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
+ {"View/Goto/NextPart", NULL, N_("Next part"), "A", NULL, G_CALLBACK(goto_next_part_cb) },
+ {"View/Goto/PrevPart", NULL, N_("Previous part"), "Z", NULL, G_CALLBACK(goto_prev_part_cb) },
+ {"View/Scroll", NULL, N_("Message scroll") },
+ {"View/Scroll/PrevLine", NULL, N_("Previous line"), NULL, NULL, G_CALLBACK(scroll_prev_line_cb) },
+ {"View/Scroll/NextLine", NULL, N_("Next line"), NULL, NULL, G_CALLBACK(scroll_next_line_cb) },
+ {"View/Scroll/PrevPage", NULL, N_("Previous page"), NULL, NULL, G_CALLBACK(scroll_prev_page_cb) },
+ {"View/Scroll/NextPage", NULL, N_("Next page"), NULL, NULL, G_CALLBACK(scroll_next_page_cb) },
+ /* {"View/Scroll/---", NULL, "---", NULL, NULL, NULL }, */
+
+ {"View/Encoding", NULL, N_("Character _encoding") }, /* set_charset_cb */
+ {"View/Encoding/---", NULL, "---" },
+#define ENC_ACTION(cs_char,c_char,string) \
+ { "View/Encoding/" cs_char, NULL, N_(string), NULL, NULL, c_char }
+
+ {"View/Encoding/Western", NULL, N_("Western European") },
+ {"View/Encoding/Baltic", NULL, N_("Baltic") },
+ {"View/Encoding/Hebrew", NULL, N_("Hebrew") },
+ {"View/Encoding/Arabic", NULL, N_("Arabic") },
+ {"View/Encoding/Cyrillic", NULL, N_("Cyrillic") },
+ {"View/Encoding/Japanese", NULL, N_("Japanese") },
+ {"View/Encoding/Chinese", NULL, N_("Chinese") },
+ {"View/Encoding/Korean", NULL, N_("Korean") },
+ {"View/Encoding/Thai", NULL, N_("Thai") },
+
+ {"View/Decode", NULL, N_("Decode") }, /* set_decode_cb */
+ {"View/Decode/---", NULL, "---" },
+
+#define DEC_ACTION(cs_type,c_type,string) \
+ { "View/Decode/" cs_type, NULL, N_(string), NULL, NULL, c_type }
+
+ {"View/---", NULL, "---", NULL, NULL, NULL },
+ {"View/MessageSource", NULL, N_("Mess_age source"), "<control>U", NULL, G_CALLBACK(view_source_cb) },
+ {"View/Part", NULL, N_("Message part") },
+ {"View/Part/AsText", NULL, N_("View as text"), "T", NULL, G_CALLBACK(view_part_as_text_cb) },
+ {"View/Part/Open", NULL, N_("Open"), "L", NULL, G_CALLBACK(open_part_cb) },
+#ifndef G_OS_WIN32
+ {"View/Part/OpenWith", NULL, N_("Open with..."), "O", NULL, G_CALLBACK(open_part_with_cb) },
#endif
- {N_("/_File/_Print..."), "<control>P", print_cb, 0, NULL},
- {N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_File/_Close"), "<control>W", close_cb, 0, NULL},
-
- {N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Edit/_Copy"), "<control>C", copy_cb, 0, NULL},
- {N_("/_Edit/Select _all"), "<control>A", allsel_cb, 0, NULL},
- {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit/_Find in current message..."),
- "<control>F", search_cb, 0, NULL},
-
- {N_("/_View"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/_Go to"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/_Go to/_Previous message"), "P", prev_cb, 0, NULL},
- {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL},
- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Go to/P_revious unread message"),
- "<shift>P", prev_unread_cb, 0, NULL},
- {N_("/_View/_Go to/N_ext unread message"),
- "<shift>N", next_unread_cb, 0, NULL},
- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Go to/Previous ne_w message"), NULL, prev_new_cb, 0, NULL},
- {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL},
- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Go to/Previous _marked message"),
- NULL, prev_marked_cb, 0, NULL},
- {N_("/_View/_Go to/Next m_arked message"),
- NULL, next_marked_cb, 0, NULL},
- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Go to/Previous _labeled message"),
- NULL, prev_labeled_cb, 0, NULL},
- {N_("/_View/_Go to/Next la_beled message"),
- NULL, next_labeled_cb, 0, NULL},
- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Go to/Last read message"),
- NULL, last_read_cb, 0, NULL},
- {N_("/_View/_Go to/Parent message"),
- "<control>Up", parent_cb, 0, NULL},
- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Go to/Next unread _folder"), "<shift>G", goto_unread_folder_cb, 0, NULL},
- {N_("/_View/_Go to/_Other folder..."), "G", goto_folder_cb, 0, NULL},
- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
-
-#define ENC_SEPARATOR \
- {N_("/_View/Character _encoding/---"), NULL, NULL, 0, "<Separator>"}
-#define ENC_ACTION(action) \
- NULL, set_charset_cb, action, "/View/Character encoding/Auto detect"
-
- {N_("/_View/Character _encoding"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/Character _encoding/_Auto detect"),
- NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/7bit ASCII (US-ASC_II)"),
- ENC_ACTION(C_US_ASCII)},
-
- {N_("/_View/Character _encoding/Unicode (_UTF-8)"),
- ENC_ACTION(C_UTF_8)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Western European (ISO-8859-_1)"),
- ENC_ACTION(C_ISO_8859_1)},
- {N_("/_View/Character _encoding/Western European (ISO-8859-15)"),
- ENC_ACTION(C_ISO_8859_15)},
- {N_("/_View/Character _encoding/Western European (Windows-1252)"),
- ENC_ACTION(C_WINDOWS_1252)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Central European (ISO-8859-_2)"),
- ENC_ACTION(C_ISO_8859_2)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/_Baltic (ISO-8859-13)"),
- ENC_ACTION(C_ISO_8859_13)},
- {N_("/_View/Character _encoding/Baltic (ISO-8859-_4)"),
- ENC_ACTION(C_ISO_8859_4)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Greek (ISO-8859-_7)"),
- ENC_ACTION(C_ISO_8859_7)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Hebrew (ISO-8859-_8)"),
- ENC_ACTION(C_ISO_8859_8)},
- {N_("/_View/Character _encoding/Hebrew (Windows-1255)"),
- ENC_ACTION(C_CP1255)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Arabic (ISO-8859-_6)"),
- ENC_ACTION(C_ISO_8859_6)},
- {N_("/_View/Character _encoding/Arabic (Windows-1256)"),
- ENC_ACTION(C_CP1256)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Turkish (ISO-8859-_9)"),
- ENC_ACTION(C_ISO_8859_9)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Cyrillic (ISO-8859-_5)"),
- ENC_ACTION(C_ISO_8859_5)},
- {N_("/_View/Character _encoding/Cyrillic (KOI8-_R)"),
- ENC_ACTION(C_KOI8_R)},
- {N_("/_View/Character _encoding/Cyrillic (KOI8-U)"),
- ENC_ACTION(C_KOI8_U)},
- {N_("/_View/Character _encoding/Cyrillic (Windows-1251)"),
- ENC_ACTION(C_CP1251)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Japanese (ISO-2022-_JP)"),
- ENC_ACTION(C_ISO_2022_JP)},
- {N_("/_View/Character _encoding/Japanese (ISO-2022-JP-2)"),
- ENC_ACTION(C_ISO_2022_JP_2)},
- {N_("/_View/Character _encoding/Japanese (_EUC-JP)"),
- ENC_ACTION(C_EUC_JP)},
- {N_("/_View/Character _encoding/Japanese (_Shift__JIS)"),
- ENC_ACTION(C_SHIFT_JIS)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Simplified Chinese (_GB2312)"),
- ENC_ACTION(C_GB2312)},
- {N_("/_View/Character _encoding/Simplified Chinese (GBK)"),
- ENC_ACTION(C_GBK)},
- {N_("/_View/Character _encoding/Traditional Chinese (_Big5)"),
- ENC_ACTION(C_BIG5)},
- {N_("/_View/Character _encoding/Traditional Chinese (EUC-_TW)"),
- ENC_ACTION(C_EUC_TW)},
- {N_("/_View/Character _encoding/Chinese (ISO-2022-_CN)"),
- ENC_ACTION(C_ISO_2022_CN)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Korean (EUC-_KR)"),
- ENC_ACTION(C_EUC_KR)},
- {N_("/_View/Character _encoding/Korean (ISO-2022-KR)"),
- ENC_ACTION(C_ISO_2022_KR)},
- ENC_SEPARATOR,
- {N_("/_View/Character _encoding/Thai (TIS-620)"),
- ENC_ACTION(C_TIS_620)},
- {N_("/_View/Character _encoding/Thai (Windows-874)"),
- ENC_ACTION(C_WINDOWS_874)},
-
-#undef ENC_SEPARATOR
-#undef ENC_ACTION
-
-#define DEC_SEPARATOR \
- {N_("/_View/Decode/---"), NULL, NULL, 0, "<Separator>"}
-#define DEC_ACTION(action) \
- NULL, set_decode_cb, action, "/View/Decode/Auto detect"
- {N_("/_View/Decode"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/Decode/_Auto detect"),
- NULL, set_decode_cb, 0, "<RadioItem>"},
- {N_("/_View/Decode/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/Decode/_8bit"), DEC_ACTION(ENC_8BIT)},
- {N_("/_View/Decode/_Quoted printable"), DEC_ACTION(ENC_QUOTED_PRINTABLE)},
- {N_("/_View/Decode/_Base64"), DEC_ACTION(ENC_BASE64)},
- {N_("/_View/Decode/_Uuencode"), DEC_ACTION(ENC_X_UUENCODE)},
-
-#undef DEC_SEPARATOR
-#undef DEC_ACTION
-
- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL},
- {N_("/_View/Show all _headers"),"<control>H", show_all_header_cb, 0, "<ToggleItem>"},
- {N_("/_View/Quotes"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/Quotes/_Fold all"), "<control><shift>Q", msg_hide_quotes_cb, 1, "<ToggleItem>"},
- {N_("/_View/Quotes/Fold from level _2"),NULL, msg_hide_quotes_cb, 2, "<ToggleItem>"},
- {N_("/_View/Quotes/Fold from level _3"),NULL, msg_hide_quotes_cb, 3, "<ToggleItem>"},
-
- {N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/Compose _new message"),
- "<control>M", compose_cb, 0, NULL},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Reply"), "<control>R", reply_cb, COMPOSE_REPLY, NULL},
- {N_("/_Message/Repl_y to/_all"),
- "<control><shift>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
- {N_("/_Message/Repl_y to/_sender"),
- NULL, reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
- {N_("/_Message/Repl_y to/mailing _list"),
- "<control>L", reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Forward"), "<control><alt>F", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
- {N_("/_Message/For_ward as attachment"),
- NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
- {N_("/_Message/Redirec_t"), NULL, reply_cb, COMPOSE_REDIRECT, NULL},
-
- {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tools/_Address book"), "<control><shift>A", addressbook_open_cb, 0, NULL},
- {N_("/_Tools/Add sender to address boo_k"),
- NULL, add_address_cb, 0, NULL},
- {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/_Create filter rule"),
- NULL, NULL, 0, "<Branch>"},
- {N_("/_Tools/_Create filter rule/_Automatically"),
- NULL, create_filter_cb, FILTER_BY_AUTO, NULL},
- {N_("/_Tools/_Create filter rule/by _From"),
- NULL, create_filter_cb, FILTER_BY_FROM, NULL},
- {N_("/_Tools/_Create filter rule/by _To"),
- NULL, create_filter_cb, FILTER_BY_TO, NULL},
- {N_("/_Tools/_Create filter rule/by _Subject"),
- NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
- {N_("/_Tools/Create processing rule"),
- NULL, NULL, 0, "<Branch>"},
- {N_("/_Tools/Create processing rule/_Automatically"),
- NULL, create_processing_cb, FILTER_BY_AUTO, NULL},
- {N_("/_Tools/Create processing rule/by _From"),
- NULL, create_processing_cb, FILTER_BY_FROM, NULL},
- {N_("/_Tools/Create processing rule/by _To"),
- NULL, create_processing_cb, FILTER_BY_TO, NULL},
- {N_("/_Tools/Create processing rule/by _Subject"),
- NULL, create_processing_cb, FILTER_BY_SUBJECT, NULL},
- {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/List _URLs..."), "<shift><control>U", open_urls_cb, 0, NULL},
- {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
-
- {N_("/_Help"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Help/_About"), NULL, about_cb, 0, NULL}
+
+ {"View/Quotes", NULL, N_("Quotes") },
+
+/* Message menu */
+ {"Message/Compose", NULL, N_("Compose _new message"), "<control>M", NULL, G_CALLBACK(compose_cb) },
+ {"Message/---", NULL, "---", NULL, NULL, NULL },
+
+ {"Message/Reply", NULL, N_("_Reply"), "<control>R", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY */
+ {"Message/ReplyTo", NULL, N_("Repl_y to") },
+ {"Message/ReplyTo/All", NULL, N_("_All"), "<control><shift>R", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY_TO_ALL */
+ {"Message/ReplyTo/Sender", NULL, N_("_Sender"), NULL, NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY_TO_SENDER */
+ {"Message/ReplyTo/List", NULL, N_("Mailing _list"), "<control>L", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REPLY_TO_LIST */
+ /* {"Message/---", NULL, "---", NULL, NULL, NULL }, */
+
+ {"Message/Forward", NULL, N_("_Forward"), "<control><alt>F", NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_FORWARD_INLINE */
+ {"Message/ForwardAtt", NULL, N_("For_ward as attachment"), NULL, NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_FORWARD_AS_ATTACH */
+ {"Message/Redirect", NULL, N_("Redirec_t"), NULL, NULL, G_CALLBACK(reply_cb) }, /* COMPOSE_REDIRECT */
+ {"Message/CheckSignature", NULL, N_("Check signature"), "C", NULL, G_CALLBACK(check_signature_cb) },
+
+/* Tools menu */
+ {"Tools/AddressBook", NULL, N_("_Address book"), "<control><shift>A", NULL, G_CALLBACK(addressbook_open_cb) },
+ {"Tools/AddSenderToAB", NULL, N_("Add sender to address boo_k"), NULL, NULL, G_CALLBACK(add_address_cb) },
+ {"Tools/---", NULL, "---", NULL, NULL, NULL },
+
+ {"Tools/CreateFilterRule", NULL, N_("_Create filter rule") },
+ {"Tools/CreateFilterRule/Automatically", NULL, N_("_Automatically"), NULL, NULL, G_CALLBACK(create_filter_cb) }, /* FILTER_BY_AUTO */
+ {"Tools/CreateFilterRule/ByFrom", NULL, N_("By _From"), NULL, NULL, G_CALLBACK(create_filter_cb) }, /* FILTER_BY_FROM */
+ {"Tools/CreateFilterRule/ByTo", NULL, N_("By _To"), NULL, NULL, G_CALLBACK(create_filter_cb) }, /* FILTER_BY_TO */
+ {"Tools/CreateFilterRule/BySubject", NULL, N_("By _Subject"), NULL, NULL, G_CALLBACK(create_filter_cb) }, /* FILTER_BY_SUBJECT */
+
+ {"Tools/CreateProcessingRule", NULL, N_("Create processing rule") },
+ {"Tools/CreateProcessingRule/Automatically", NULL, N_("_Automatically"), NULL, NULL, G_CALLBACK(create_processing_cb) },
+ {"Tools/CreateProcessingRule/ByFrom", NULL, N_("By _From"), NULL, NULL, G_CALLBACK(create_processing_cb) },
+ {"Tools/CreateProcessingRule/ByTo", NULL, N_("By _To"), NULL, NULL, G_CALLBACK(create_processing_cb) },
+ {"Tools/CreateProcessingRule/BySubject", NULL, N_("By _Subject"), NULL, NULL, G_CALLBACK(create_processing_cb) },
+
+ /* {"Tools/---", NULL, "---", NULL, NULL, NULL }, */
+
+ {"Tools/ListUrls", NULL, N_("List _URLs..."), "<control><shift>U", NULL, G_CALLBACK(open_urls_cb) },
+
+ /* {"Tools/---", NULL, "---", NULL, NULL, NULL }, */
+ {"Tools/Actions", NULL, N_("Actio_ns") },
+ {"Tools/Actions/PlaceHolder", NULL, "Placeholder", NULL, NULL, G_CALLBACK(messageview_nothing_cb) },
+
+/* Help menu */
+ {"Help/About", NULL, N_("_About"), NULL, NULL, G_CALLBACK(about_cb) },
+};
+
+static GtkToggleActionEntry msgview_toggle_entries[] =
+{
+ {"View/AllHeaders", NULL, N_("Show all _headers"), "<control>H", NULL, G_CALLBACK(show_all_header_cb) }, /* toggle */
+ {"View/Quotes/CollapseAll", NULL, N_("_Collapse all"), "<control><shift>Q", NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 1 toggle */
+ {"View/Quotes/Collapse2", NULL, N_("Collapse from level _2"), NULL, NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 2 toggle */
+ {"View/Quotes/Collapse3", NULL, N_("Collapse from level _3"), NULL, NULL, G_CALLBACK(msg_hide_quotes_cb) }, /* 3 toggle */
+};
+
+static GtkRadioActionEntry msgview_radio_enc_entries[] =
+{
+ ENC_ACTION(CS_AUTO, C_AUTO, N_("_Automatic")), /* RADIO set_charset_cb */
+ ENC_ACTION(CS_US_ASCII, C_US_ASCII, N_("7bit ASCII (US-ASC_II)")), /* RADIO set_charset_cb */
+ ENC_ACTION(CS_UTF_8, C_UTF_8, N_("Unicode (_UTF-8)")), /* RADIO set_charset_cb */
+ ENC_ACTION("Western/"CS_ISO_8859_1, C_ISO_8859_1, "ISO-8859-_1"), /* RADIO set_charset_cb */
+ ENC_ACTION("Western/"CS_ISO_8859_15, C_ISO_8859_15, "ISO-8859-15"), /* RADIO set_charset_cb */
+ ENC_ACTION("Western/"CS_WINDOWS_1252, C_WINDOWS_1252, "Windows-1252"), /* RADIO set_charset_cb */
+ ENC_ACTION(CS_ISO_8859_2, C_ISO_8859_2, N_("Central European (ISO-8859-_2)")), /* RADIO set_charset_cb */
+ ENC_ACTION("Baltic/"CS_ISO_8859_13, C_ISO_8859_13, "ISO-8859-13"), /* RADIO set_charset_cb */
+ ENC_ACTION("Baltic/"CS_ISO_8859_4, C_ISO_8859_14, "ISO-8859-_4"), /* RADIO set_charset_cb */
+ ENC_ACTION(CS_ISO_8859_7, C_ISO_8859_7, N_("Greek (ISO-8859-_7)")), /* RADIO set_charset_cb */
+ ENC_ACTION("Hebrew/"CS_ISO_8859_8, C_ISO_8859_8, "ISO-8859-_8"), /* RADIO set_charset_cb */
+ ENC_ACTION("Hebrew/"CS_WINDOWS_1255, C_WINDOWS_1255, "Windows-1255"), /* RADIO set_charset_cb */
+ ENC_ACTION("Arabic/"CS_ISO_8859_6, C_ISO_8859_6, "ISO-8859-_6"), /* RADIO set_charset_cb */
+ ENC_ACTION("Arabic/"CS_WINDOWS_1256, C_WINDOWS_1256, "Windows-1256"), /* RADIO set_charset_cb */
+ ENC_ACTION(CS_ISO_8859_9, C_ISO_8859_9, N_("Turkish (ISO-8859-_9)")), /* RADIO set_charset_cb */
+ ENC_ACTION("Cyrillic/"CS_ISO_8859_5, C_ISO_8859_5, "ISO-8859-_5"), /* RADIO set_charset_cb */
+ ENC_ACTION("Cyrillic/"CS_KOI8_R, C_KOI8_R, "KOI8-_R"), /* RADIO set_charset_cb */
+ ENC_ACTION("Cyrillic/"CS_MACCYR, C_MACCYR, "MAC_CYR"), /* RADIO set_charset_cb */
+ ENC_ACTION("Cyrillic/"CS_KOI8_U, C_KOI8_U, "KOI8-_U"), /* RADIO set_charset_cb */
+ ENC_ACTION("Cyrillic/"CS_WINDOWS_1251, C_WINDOWS_1251, "Windows-1251"), /* RADIO set_charset_cb */
+ ENC_ACTION("Japanese/"CS_ISO_2022_JP, C_ISO_2022_JP, "ISO-2022-_JP"), /* RADIO set_charset_cb */
+ ENC_ACTION("Japanese/"CS_ISO_2022_JP_2, C_ISO_2022_JP_2, "ISO-2022-JP-_2"), /* RADIO set_charset_cb */
+ ENC_ACTION("Japanese/"CS_EUC_JP, C_EUC_JP, "_EUC-JP"), /* RADIO set_charset_cb */
+ ENC_ACTION("Japanese/"CS_SHIFT_JIS, C_SHIFT_JIS, "_Shift-JIS"), /* RADIO set_charset_cb */
+ ENC_ACTION("Chinese/"CS_GB18030, C_GB18030, "_GB18030"), /* RADIO set_charset_cb */
+ ENC_ACTION("Chinese/"CS_GB2312, C_GB2312, "_GB2312"), /* RADIO set_charset_cb */
+ ENC_ACTION("Chinese/"CS_GBK, C_GBK, "GB_K"), /* RADIO set_charset_cb */
+ ENC_ACTION("Chinese/"CS_BIG5, C_BIG5, "_Big5-JP"), /* RADIO set_charset_cb */
+ ENC_ACTION("Chinese/"CS_EUC_TW, C_EUC_TW, "EUC-_TW"), /* RADIO set_charset_cb */
+ ENC_ACTION("Korean/"CS_EUC_KR, C_EUC_KR, "_EUC-KR"), /* RADIO set_charset_cb */
+ ENC_ACTION("Korean/"CS_ISO_2022_KR, C_ISO_2022_KR, "_ISO-2022-KR"), /* RADIO set_charset_cb */
+ ENC_ACTION("Thai/"CS_TIS_620, C_TIS_620, "_TIS-620-KR"), /* RADIO set_charset_cb */
+ ENC_ACTION("Thai/"CS_WINDOWS_874, C_WINDOWS_874, "_Windows-874"), /* RADIO set_charset_cb */
+};
+
+static GtkRadioActionEntry msgview_radio_dec_entries[] =
+{
+ DEC_ACTION("AutoDetect", 0, N_("_Auto detect")), /* set_decode_cb */
+ /* --- */
+ DEC_ACTION("8bit", ENC_8BIT, "_8bit"),
+ DEC_ACTION("QP", ENC_QUOTED_PRINTABLE, "_Quoted printable"),
+ DEC_ACTION("B64", ENC_BASE64, "_Base64"),
+ DEC_ACTION("Uuencode", ENC_X_UUENCODE, "_Uuencode"),
};
MessageView *messageview_create(MainWindow *mainwin)
messageview->statusbar = NULL;
messageview->statusbar_cid = 0;
+ messageview->show_full_text= FALSE;
+ messageview->update_needed = FALSE;
+
messageview->msginfo_update_callback_id =
hooks_register_hook(MSGINFO_UPDATE_HOOKLIST, messageview_update_msg, (gpointer) messageview);
return messageview;
}
-GList *messageview_get_msgview_list(void)
+const GList *messageview_get_msgview_list(void)
{
return msgview_list;
}
void messageview_update_actions_menu(MessageView *msgview)
{
- GtkItemFactory *ifactory;
-
/* Messages opened in a new window do not have a menu bar */
if (msgview->menubar == NULL)
return;
- ifactory = gtk_item_factory_from_widget(msgview->menubar);
- action_update_msgview_menu(ifactory, "/Tools/Actions", msgview);
+ action_update_msgview_menu(msgview->ui_manager, "/Menu/Tools/Actions", msgview);
}
static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
GtkWidget *handlebox;
GtkWidget *vbox;
GtkWidget *menubar;
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
GtkWidget *statusbar = NULL;
#endif
- guint n_menu_entries;
+ GtkActionGroup *action_group;
+
vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
- n_menu_entries = sizeof(msgview_entries) / sizeof(msgview_entries[0]);
- menubar = menubar_create(window, msgview_entries,
- n_menu_entries, "<MessageView>", msgview);
- gtk_widget_show(menubar);
+ msgview->ui_manager = gtk_ui_manager_new();
+ action_group = cm_menu_create_action_group_full(msgview->ui_manager,"Menu", msgview_entries,
+ G_N_ELEMENTS(msgview_entries), (gpointer)msgview);
+ gtk_action_group_add_toggle_actions(action_group, msgview_toggle_entries,
+ G_N_ELEMENTS(msgview_toggle_entries), (gpointer)msgview);
+ gtk_action_group_add_radio_actions(action_group, msgview_radio_enc_entries,
+ G_N_ELEMENTS(msgview_radio_enc_entries), C_AUTO, G_CALLBACK(set_charset_cb), (gpointer)msgview);
+ gtk_action_group_add_radio_actions(action_group, msgview_radio_dec_entries,
+ G_N_ELEMENTS(msgview_radio_dec_entries), C_AUTO, G_CALLBACK(set_decode_cb), (gpointer)msgview);
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/", "Menu", NULL, GTK_UI_MANAGER_MENUBAR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "File", "File", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "Edit", "Edit", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "View", "View", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "Message", "Message", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "Tools", "Tools", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu", "Help", "Help", GTK_UI_MANAGER_MENU)
+
+/* File menu */
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "SaveAs", "File/SaveAs", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "SavePartAs", "File/SavePartAs", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "Separator1", "File/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "PageSetup", "File/PageSetup", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "Print", "File/Print", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "Separator2", "File/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/File", "Close", "File/Close", GTK_UI_MANAGER_MENUITEM)
+
+/* Edit menu */
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Edit", "Copy", "Edit/Copy", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Edit", "SelectAll", "Edit/SelectAll", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Edit", "Separator1", "Edit/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Edit", "Find", "Edit/Find", GTK_UI_MANAGER_MENUITEM)
+
+/* View menu */
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Goto", "View/Goto", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Prev", "View/Goto/Prev", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Next", "View/Goto/Next", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator1", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevUnread", "View/Goto/PrevUnread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextUnread", "View/Goto/NextUnread", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator2", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevNew", "View/Goto/PrevNew", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextNew", "View/Goto/NextNew", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator3", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevMarked", "View/Goto/PrevMarked", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextMarked", "View/Goto/NextMarked", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator4", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevLabeled", "View/Goto/PrevLabeled", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextLabeled", "View/Goto/NextLabeled", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator5", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevHistory", "View/Goto/PrevHistory", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextHistory", "View/Goto/NextHistory", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator6", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "ParentMessage", "View/Goto/ParentMessage", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator7", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextUnreadFolder", "View/Goto/NextUnreadFolder", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Folder", "View/Goto/Folder", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "Separator8", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextPart", "View/Goto/NextPart", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevPart", "View/Goto/PrevPart", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Scroll", "View/Scroll", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "PrevLine", "View/Scroll/PrevLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "NextLine", "View/Scroll/NextLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "PrevPage", "View/Scroll/PrevPage", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "NextPage", "View/Scroll/NextPage", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Separator1", "View/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Encoding", "View/Encoding", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_AUTO, "View/Encoding/"CS_AUTO, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Separator1", "View/Encoding/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_US_ASCII, "View/Encoding/"CS_US_ASCII, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_UTF_8, "View/Encoding/"CS_UTF_8, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Separator2", "View/Encoding/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Western", "View/Encoding/Western", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Western", CS_ISO_8859_1, "View/Encoding/Western/"CS_ISO_8859_1, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Western", CS_ISO_8859_15, "View/Encoding/Western/"CS_ISO_8859_15, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Western", CS_WINDOWS_1252, "View/Encoding/Western/"CS_WINDOWS_1252, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_ISO_8859_2, "View/Encoding/"CS_ISO_8859_2, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Baltic", "View/Encoding/Baltic", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Baltic", CS_ISO_8859_13, "View/Encoding/Baltic/"CS_ISO_8859_13, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Baltic", CS_ISO_8859_4, "View/Encoding/Baltic/"CS_ISO_8859_4, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_ISO_8859_7, "View/Encoding/"CS_ISO_8859_7, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Hebrew", "View/Encoding/Hebrew", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Hebrew", CS_ISO_8859_8, "View/Encoding/Hebrew/"CS_ISO_8859_8, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Hebrew", CS_WINDOWS_1255, "View/Encoding/Hebrew/"CS_WINDOWS_1255, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Arabic", "View/Encoding/Arabic", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Arabic", CS_ISO_8859_6, "View/Encoding/Arabic/"CS_ISO_8859_6, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Arabic", CS_WINDOWS_1256, "View/Encoding/Arabic/"CS_WINDOWS_1256, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", CS_ISO_8859_9, "View/Encoding/"CS_ISO_8859_9, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Cyrillic", "View/Encoding/Cyrillic", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_ISO_8859_5, "View/Encoding/Cyrillic/"CS_ISO_8859_5, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_KOI8_R, "View/Encoding/Cyrillic/"CS_KOI8_R, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_MACCYR, "View/Encoding/Cyrillic/"CS_MACCYR, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_KOI8_U, "View/Encoding/Cyrillic/"CS_KOI8_U, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Cyrillic", CS_WINDOWS_1251, "View/Encoding/Cyrillic/"CS_WINDOWS_1251, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Japanese", "View/Encoding/Japanese", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Japanese", CS_ISO_2022_JP, "View/Encoding/Japanese/"CS_ISO_2022_JP, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Japanese", CS_ISO_2022_JP_2, "View/Encoding/Japanese/"CS_ISO_2022_JP_2, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Japanese", CS_EUC_JP, "View/Encoding/Japanese/"CS_EUC_JP, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Japanese", CS_SHIFT_JIS, "View/Encoding/Japanese/"CS_SHIFT_JIS, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Chinese", "View/Encoding/Chinese", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Chinese", CS_GB18030, "View/Encoding/Chinese/"CS_GB18030, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Chinese", CS_GB2312, "View/Encoding/Chinese/"CS_GB2312, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Chinese", CS_GBK, "View/Encoding/Chinese/"CS_GBK, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Chinese", CS_BIG5, "View/Encoding/Chinese/"CS_BIG5, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Chinese", CS_EUC_TW, "View/Encoding/Chinese/"CS_EUC_TW, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Korean", "View/Encoding/Korean", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Korean", CS_EUC_KR, "View/Encoding/Korean/"CS_EUC_KR, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Korean", CS_ISO_2022_KR, "View/Encoding/Korean/"CS_ISO_2022_KR, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding", "Thai", "View/Encoding/Thai", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Thai", CS_TIS_620, "View/Encoding/Thai/"CS_TIS_620, GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Encoding/Thai", CS_WINDOWS_874, "View/Encoding/Thai/"CS_WINDOWS_874, GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Decode", "View/Decode", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "AutoDetect", "View/Decode/AutoDetect", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "Separator1", "View/Decode/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "8bit", "View/Decode/8bit", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "QP", "View/Decode/QP", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "B64", "View/Decode/B64", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Decode", "Uuencode", "View/Decode/Uuencode", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Separator2", "View/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "MessageSource", "View/MessageSource", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "AllHeaders", "View/AllHeaders", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Quotes", "View/Quotes", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "CollapseAll", "View/Quotes/CollapseAll", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "Collapse2", "View/Quotes/Collapse2", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Quotes", "Collapse3", "View/Quotes/Collapse3", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Part", "View/Part", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Part", "AsText", "View/Part/AsText", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Part", "Open", "View/Part/Open", GTK_UI_MANAGER_MENUITEM)
+#ifndef G_OS_WIN32
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Part", "OpenWith", "View/Part/OpenWith", GTK_UI_MANAGER_MENUITEM)
+#endif
+
+/* Message menu */
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Compose", "Message/Compose", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Separator1", "Message/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Reply", "Message/Reply", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "ReplyTo", "Message/ReplyTo", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message/ReplyTo", "All", "Message/ReplyTo/All", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message/ReplyTo", "Sender", "Message/ReplyTo/Sender", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message/ReplyTo", "List", "Message/ReplyTo/List", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Separator2", "Message/---", GTK_UI_MANAGER_SEPARATOR)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Forward", "Message/Forward", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "ForwardAtt", "Message/ForwardAtt", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "Redirect", "Message/Redirect", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Message", "CheckSignature", "Message/CheckSignature", GTK_UI_MANAGER_MENUITEM)
+
+/* Tools menu */
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "AddressBook", "Tools/AddressBook", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "AddSenderToAB", "Tools/AddSenderToAB", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "Separator1", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "CreateFilterRule", "Tools/CreateFilterRule", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateFilterRule", "Automatically", "Tools/CreateFilterRule/Automatically", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateFilterRule", "ByFrom", "Tools/CreateFilterRule/ByFrom", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateFilterRule", "ByTo", "Tools/CreateFilterRule/ByTo", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateFilterRule", "BySubject", "Tools/CreateFilterRule/BySubject", GTK_UI_MANAGER_MENUITEM)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "CreateProcessingRule", "Tools/CreateProcessingRule", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateProcessingRule", "Automatically", "Tools/CreateProcessingRule/Automatically", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateProcessingRule", "ByFrom", "Tools/CreateProcessingRule/ByFrom", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateProcessingRule", "ByTo", "Tools/CreateProcessingRule/ByTo", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/CreateProcessingRule", "BySubject", "Tools/CreateProcessingRule/BySubject", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "Separator2", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "ListUrls", "Tools/ListUrls", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "Separator3", "Tools/---", GTK_UI_MANAGER_SEPARATOR)
+
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools", "Actions", "Tools/Actions", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Tools/Actions", "PlaceHolder", "Tools/Actions/PlaceHolder", GTK_UI_MANAGER_MENUITEM)
+
+/* Help menu */
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/Help", "About", "Help/About", GTK_UI_MANAGER_MENUITEM)
+
+ menubar = gtk_ui_manager_get_widget(msgview->ui_manager, "/Menu");
+ gtk_widget_show_all(menubar);
+ gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(msgview->ui_manager));
+
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+ cm_toggle_menu_set_active_full(msgview->ui_manager, "Menu/View/AllHeaders",
+ prefs_common.show_all_headers);
+
if (prefs_common.toolbar_detachable) {
handlebox = gtk_handle_box_new();
} else {
}
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
gtk_widget_realize(handlebox);
-#ifdef MAEMO
- msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, window,
- (gpointer)msgview);
- msgview->statusbar = NULL;
- msgview->statusbar_cid = 0;
-#else
msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
(gpointer)msgview);
+#ifndef GENERIC_UMPC
statusbar = gtk_statusbar_new();
gtk_widget_show(statusbar);
gtk_box_pack_end(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0);
msgview->statusbar = statusbar;
msgview->statusbar_cid = gtk_statusbar_get_context_id
(GTK_STATUSBAR(statusbar), "Message View");
+#else
+ msgview->statusbar = NULL;
+ msgview->statusbar_cid = 0;
#endif
gtk_widget_set_size_request(window, prefs_common.msgwin_width,
prefs_common.msgwin_height);
+#ifdef G_OS_WIN32
+ gtk_window_move(GTK_WINDOW(window), 48, 48);
+#endif
msgview = messageview_create(mainwin);
msgview);
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(messageview_delete_cb), msgview);
-#ifdef MAEMO
- maemo_connect_key_press_to_mainwindow(GTK_WINDOW(window));
-#else
g_signal_connect(G_OBJECT(window), "key_press_event",
G_CALLBACK(key_pressed), msgview);
-#endif
messageview_add_toolbar(msgview, window);
if (show) {
- gtk_widget_grab_focus(msgview->mimeview->textview->text);
gtk_widget_show(window);
} else {
gtk_widget_realize(window);
prefs_common.toolbar_style);
messageview_init(msgview);
+ if (show) {
+ GTK_EVENTS_FLUSH();
+ gtk_widget_grab_focus(msgview->mimeview->textview->text);
+ }
+
return msgview;
}
{
char *src;
- g_return_if_fail(src_ != NULL);
- g_return_if_fail(dest != NULL);
+ cm_return_if_fail(src_ != NULL);
+ cm_return_if_fail(dest != NULL);
if (len < 1) return;
ok = strcasecmp(to_addr, buf);
g_free(to_addr);
} else {
- strncpy(buf, _("<No Return-Path found>"),
+ g_strlcpy(buf, _("<No Return-Path found>"),
sizeof(buf));
}
/* chmod for security */
if (change_file_mode_rw(fp, tmp) < 0) {
FILE_OP_ERROR(tmp, "chmod");
- g_warning("can't change file mode\n");
+ g_warning("can't change file mode");
}
addr = g_strdup(to);
addrp = addr;
/* write queue headers */
- if (fprintf(fp, "AF:\n"
+ ok = fprintf(fp, "AF:\n"
"NF:0\n"
"PS:10\n"
"SRH:1\n"
"R:<%s>\n",
account->address,
account->smtp_server?account->smtp_server:"",
- addrp) < 0) {
- g_free(addrp);
- fclose(fp);
- g_unlink(tmp);
- return -1;
- }
+ addrp);
g_free(addrp);
+ if (ok < 0)
+ goto FILE_ERROR;
/* check whether we need to save the message */
outbox = account_get_special_folder(account, F_OUTBOX);
outbox = NULL;
if (outbox) {
path = folder_item_get_identifier(outbox);
- if (fprintf(fp, "SCF:%s\n", path) < 0) {
- g_free(path);
- fclose(fp);
- g_unlink(tmp);
- return -1;
- }
+ ok = fprintf(fp, "SCF:%s\n", path);
g_free(path);
+
+ if (ok < 0)
+ goto FILE_ERROR;
}
- if (fprintf(fp, "X-Claws-End-Special-Headers: 1\n") < 0) {
- fclose(fp);
- g_unlink(tmp);
- return -1;
- }
+ if (fprintf(fp, "X-Claws-End-Special-Headers: 1\n") < 0)
+ goto FILE_ERROR;
/* Date */
get_rfc822_date(buf, sizeof(buf));
- if (fprintf(fp, "Date: %s\n", buf) < 0) {
- fclose(fp);
- g_unlink(tmp);
- return -1;
- }
+ if (fprintf(fp, "Date: %s\n", buf) < 0)
+ goto FILE_ERROR;
/* From */
if (account->name && *account->name) {
notification_convert_header
(buf, sizeof(buf), account->name,
strlen("From: "));
- if (fprintf(fp, "From: %s <%s>\n", buf, account->address) < 0) {
- fclose(fp);
- g_unlink(tmp);
- return -1;
- }
+ if (fprintf(fp, "From: %s <%s>\n", buf, account->address) < 0)
+ goto FILE_ERROR;
} else
- if (fprintf(fp, "From: %s\n", account->address) < 0) {
- fclose(fp);
- g_unlink(tmp);
- return -1;
- }
-
+ if (fprintf(fp, "From: %s\n", account->address) < 0)
+ goto FILE_ERROR;
- if (fprintf(fp, "To: %s\n", to) < 0) {
- fclose(fp);
- g_unlink(tmp);
- return -1;
- }
+ if (fprintf(fp, "To: %s\n", to) < 0)
+ goto FILE_ERROR;
/* Subject */
notification_convert_header(buf, sizeof(buf), msginfo->subject,
strlen("Subject: "));
- if (fprintf(fp, "Subject: Disposition notification: %s\n", buf) < 0) {
- fclose(fp);
- g_unlink(tmp);
- return -1;
- }
+ if (fprintf(fp, "Subject: Disposition notification: %s\n", buf) < 0)
+ goto FILE_ERROR;
/* Message ID */
if (account->set_domain && account->domain) {
}
if (account->gen_msgid) {
- generate_msgid(buf, sizeof(buf));
-
- if (fprintf(fp, "Message-ID: <%s>\n", buf) < 0) {
- fclose(fp);
- g_unlink(tmp);
- return -1;
+ gchar *addr = NULL;
+ if (account->msgid_with_addr) {
+ addr = account->address;
}
+ generate_msgid(buf, sizeof(buf), addr);
+
+ if (fprintf(fp, "Message-ID: <%s>\n", buf) < 0)
+ goto FILE_ERROR;
}
boundary = generate_mime_boundary("DN");
orig_to = g_strdup(msginfo->to);
extract_address(orig_to);
}
- if (msginfo->subject) {
+ if (msginfo->subject && *(msginfo->subject)) {
enc_sub = g_malloc0(strlen(msginfo->subject)*8);
qp_encode_line(enc_sub, (const guchar *)msginfo->subject);
g_strstrip(enc_sub);
}
- if (fprintf(fp, "MIME-Version: 1.0\n"
+ ok = fprintf(fp,"MIME-Version: 1.0\n"
"Content-Type: multipart/report; report-type=disposition-notification;\n"
" boundary=\"%s\"\n"
"\n"
"\n"
"--%s\n"
"Content-Type: application/octet-stream\n"
+ "\n"
"Reporting-UA: %s\n"
"Original-Recipient: rfc822;%s\n"
"Final-Recipient: rfc822;%s\n"
orig_to?orig_to:"No To:",
account->address,
msginfo->msgid?msginfo->msgid:"NO MESSAGE ID",
- boundary) < 0) {
- fclose(fp);
- g_unlink(tmp);
- g_free(boundary);
- return -1;
- }
+ boundary);
g_free(enc_sub);
g_free(orig_to);
g_free(date);
g_free(boundary);
+ if (ok < 0)
+ goto FILE_ERROR;
+
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
- g_unlink(tmp);
+ claws_unlink(tmp);
return -1;
}
queue = account_get_special_folder(account, F_QUEUE);
if (!queue) queue = folder_get_default_queue();
if (!queue) {
- g_warning("can't find queue folder\n");
- g_unlink(tmp);
+ g_warning("can't find queue folder");
+ claws_unlink(tmp);
return -1;
}
folder_item_scan(queue);
if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
- g_warning("can't queue the message\n");
- g_unlink(tmp);
+ g_warning("can't queue the message");
+ claws_unlink(tmp);
return -1;
}
/* send it */
path = folder_item_fetch_msg(queue, num);
- ok = procmsg_send_message_queue(path, &foo, queue, num, &queued_removed);
+ ok = procmsg_send_message_queue_with_lock(path, &foo, queue, num, &queued_removed);
g_free(path);
g_free(foo);
if (ok == 0 && !queued_removed)
folder_item_remove_msg(queue, num);
return ok;
+
+FILE_ERROR:
+ fclose(fp);
+ claws_unlink(tmp);
+ return -1;
}
static gboolean find_encrypted_func(GNode *node, gpointer data)
return encinfo;
}
+static gboolean find_broken_func(GNode *node, gpointer data)
+{
+ MimeInfo *mimeinfo = (MimeInfo *) node->data;
+ MimeInfo **brokeninfo = (MimeInfo **) data;
+
+ if (mimeinfo->broken) {
+ *brokeninfo = mimeinfo;
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static MimeInfo *find_broken_part(MimeInfo *rootinfo)
+{
+ MimeInfo *brokeninfo = NULL;
+
+ g_node_traverse(rootinfo->node, G_IN_ORDER, G_TRAVERSE_ALL, -1,
+ find_broken_func, &brokeninfo);
+
+ return brokeninfo;
+}
+
+static void messageview_register_nav(MessageView *messageview)
+{
+ gchar *id;
+ gint pos = -1;
+ GList *existing;
+
+ cm_return_if_fail(messageview);
+ cm_return_if_fail(messageview->msginfo);
+
+ id = procmsg_msginfo_get_identifier(messageview->msginfo);
+ existing = g_list_find_custom(messageview->trail, id, (GCompareFunc)g_strcmp0);
+
+ if (existing != NULL)
+ pos = g_list_position(messageview->trail, existing);
+ else
+ pos = -1;
+
+ if (pos != -1) {
+ messageview->trail_pos = pos;
+ g_free(id);
+ } else {
+ /* Cut the end of the list */
+ GList *end = g_list_nth(messageview->trail, messageview->trail_pos + 1);
+ if (end) {
+ if (end->prev) {
+ end->prev->next = NULL;
+ end->prev = NULL;
+ list_free_strings(end);
+ g_list_free(end);
+ } else {
+ list_free_strings(messageview->trail);
+ g_list_free(messageview->trail);
+ messageview->trail = NULL;
+ }
+ }
+ messageview->trail = g_list_append(messageview->trail, id);
+ messageview->trail_pos = g_list_length(messageview->trail) - 1;
+
+ /* Cut the beginning if needed */
+ while (messageview->trail_pos > prefs_common.nav_history_length) {
+ g_free(messageview->trail->data);
+ messageview->trail = g_list_delete_link(messageview->trail,
+ messageview->trail);
+ messageview->trail_pos--;
+ }
+ }
+ messageview_set_menu_sensitive(messageview);
+}
+
+gboolean messageview_nav_has_prev(MessageView *messageview) {
+ return messageview != NULL && messageview->trail != NULL
+ && messageview->trail_pos > 0;
+}
+
+gboolean messageview_nav_has_next(MessageView *messageview) {
+ if (!messageview || !messageview->trail)
+ return FALSE;
+
+ return sc_g_list_bigger(messageview->trail, messageview->trail_pos + 1);
+}
+
+MsgInfo *messageview_nav_get_prev(MessageView *messageview) {
+ GList *item;
+ MsgInfo *info;
+
+ cm_return_val_if_fail(messageview, NULL);
+ cm_return_val_if_fail(messageview->trail, NULL);
+
+ do {
+ if (!messageview_nav_has_prev(messageview))
+ return NULL;
+
+ item = g_list_nth(messageview->trail, messageview->trail_pos - 1);
+ cm_return_val_if_fail(item != NULL, NULL);
+
+ info = procmsg_get_msginfo_from_identifier((const gchar *)item->data);
+ if (info != NULL)
+ break;
+
+ g_free(item->data);
+ messageview->trail = g_list_delete_link(messageview->trail, item);
+ if (messageview->trail_pos > 0)
+ messageview->trail_pos--;
+ } while (info == NULL);
+
+ return info;
+}
+
+MsgInfo *messageview_nav_get_next(MessageView *messageview) {
+ GList *item;
+ MsgInfo *info;
+
+ cm_return_val_if_fail(messageview, NULL);
+ cm_return_val_if_fail(messageview->trail, NULL);
+
+ do {
+ if (!messageview_nav_has_next(messageview))
+ return NULL;
+
+ item = g_list_nth(messageview->trail, messageview->trail_pos + 1);
+ cm_return_val_if_fail(item != NULL, NULL);
+
+ info = procmsg_get_msginfo_from_identifier((const gchar *)item->data);
+ if (info != NULL)
+ break;
+
+ g_free(item->data);
+ messageview->trail = g_list_delete_link(messageview->trail, item);
+ } while (info == NULL);
+
+ return info;
+}
+
+static gboolean messageview_try_select_mimeinfo(MessageView *messageview, MsgInfo *msginfo, MimeInfo *mimeinfo)
+{
+ if (mimeinfo->type == MIMETYPE_TEXT) {
+ if (!strcasecmp(mimeinfo->subtype, "calendar")
+ && mimeview_has_viewer_for_content_type(messageview->mimeview, "text/calendar")) {
+ mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
+ return TRUE;
+ } else if (!strcasecmp(mimeinfo->subtype, "html")
+ && mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT
+ && (msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_ALWAYS
+ || (msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_DEFAULT
+ && prefs_common.promote_html_part))) {
+ mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
+static void messageview_find_part_depth_first(MimeInfoSearch *context, MimeMediaType type, const gchar *subtype)
+{
+ MimeInfo * mimeinfo = context->current;
+
+ if (!mimeinfo)
+ return;
+
+ debug_print("found part %d/%s\n", mimeinfo->type, mimeinfo->subtype);
+
+ if (mimeinfo->type == MIMETYPE_MULTIPART) {
+ if (!strcasecmp(mimeinfo->subtype, "alternative")
+ || !strcasecmp(mimeinfo->subtype, "related")) {
+ context->found = procmime_mimeinfo_next(mimeinfo);
+ while (context->found && context->found != context->parent) {
+ if (context->found->type == type
+ && !strcasecmp(context->found->subtype, subtype))
+ break;
+ context->found = procmime_mimeinfo_next(context->found);
+ }
+ if (context->found == context->parent)
+ context->found = NULL;
+ }
+ if (!context->found
+ && (!strcasecmp(mimeinfo->subtype, "related")
+ || !strcasecmp(mimeinfo->subtype, "mixed"))) {
+ context->parent = mimeinfo;
+ context->current = procmime_mimeinfo_next(mimeinfo);
+ messageview_find_part_depth_first(context, type, subtype);
+ }
+ }
+}
+
gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
gboolean all_headers)
{
+ gchar *text = NULL;
gchar *file;
- MimeInfo *mimeinfo, *encinfo;
+ MimeInfo *mimeinfo, *encinfo, *root;
gchar *subject = NULL;
- g_return_val_if_fail(msginfo != NULL, -1);
+ cm_return_val_if_fail(msginfo != NULL, -1);
+
+ if (msginfo != messageview->msginfo)
+ messageview->show_full_text = FALSE;
if (messageview->mimeview->textview &&
messageview->mimeview->textview->loading) {
MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM);
if (messageview->toolbar) {
- if (messageview->toolbar->learn_spam_btn)
+ if (messageview->toolbar->learn_spam_btn) {
+ gboolean can_learn = FALSE;
+ if (procmsg_spam_can_learn() &&
+ (msginfo->folder &&
+ msginfo->folder->folder->klass->type != F_UNKNOWN &&
+ msginfo->folder->folder->klass->type != F_NEWS))
+ can_learn = TRUE;
+
gtk_widget_set_sensitive(
messageview->toolbar->learn_spam_btn,
- procmsg_spam_can_learn());
+ can_learn);
+ }
}
noticeview_hide(messageview->noticeview);
mimeview_clear(messageview->mimeview);
messageview->updating = TRUE;
+ if (msginfo->size > 1024*1024)
+ statuswindow_print_all(_("Fetching message (%s)..."),
+ to_human_readable(msginfo->size));
+
file = procmsg_get_message_file_path(msginfo);
+
+ if (msginfo->size > 1024*1024)
+ statuswindow_pop_all();
+
if (!file) {
- g_warning("can't get message file path.\n");
+ g_warning("can't get message file path.");
textview_show_error(messageview->mimeview->textview);
return -1;
}
while ((encinfo = find_encrypted_part(mimeinfo)) != NULL) {
debug_print("decrypting message part\n");
if (privacy_mimeinfo_decrypt(encinfo) < 0) {
- alertpanel_error(_("Couldn't decrypt: %s"),
- privacy_get_error());
+ text = g_strdup_printf(_("Couldn't decrypt: %s"),
+ privacy_get_error());
+ noticeview_show(messageview->noticeview);
+ noticeview_set_icon(messageview->noticeview,
+ STOCK_PIXMAP_NOTICE_WARN);
+ noticeview_set_text(messageview->noticeview, text);
+ gtk_widget_hide(messageview->noticeview->button);
+ gtk_widget_hide(messageview->noticeview->button2);
+ g_free(text);
break;
}
}
if (messageview->msginfo != msginfo) {
- procmsg_msginfo_free(messageview->msginfo);
+ procmsg_msginfo_free(&(messageview->msginfo));
messageview->msginfo = NULL;
messageview_set_menu_sensitive(messageview);
messageview->msginfo =
messageview_set_menu_sensitive(messageview);
messageview->msginfo = msginfo;
}
- headerview_show(messageview->headerview, messageview->msginfo);
+ if (prefs_common.display_header_pane)
+ headerview_show(messageview->headerview, messageview->msginfo);
+ messageview_register_nav(messageview);
messageview_set_position(messageview, 0);
- textview_set_all_headers(messageview->mimeview->textview,
- messageview->all_headers);
-
-#ifdef MAEMO
- maemo_window_full_screen_if_needed(GTK_WINDOW(messageview->window));
-#endif
if (messageview->window) {
gtk_window_set_title(GTK_WINDOW(messageview->window),
_("Claws Mail - Message View"));
}
mimeview_show_message(messageview->mimeview, mimeinfo, file);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
messageview_set_position(messageview, 0);
#endif
main_create_mailing_list_menu(messageview->mainwin, messageview->msginfo);
if (messageview->msginfo && messageview->msginfo->extradata
- && messageview->msginfo->extradata->partial_recv)
+ && messageview->msginfo->extradata->partial_recv
+ && !noticeview_is_visible(messageview->noticeview))
partial_recv_show(messageview->noticeview,
messageview->msginfo);
else if (messageview->msginfo && messageview->msginfo->extradata &&
(messageview->msginfo->extradata->dispositionnotificationto ||
messageview->msginfo->extradata->returnreceiptto) &&
!MSG_IS_RETRCPT_SENT(messageview->msginfo->flags) &&
- !prefs_common.never_send_retrcpt)
+ !prefs_common.never_send_retrcpt &&
+ !noticeview_is_visible(messageview->noticeview))
return_receipt_show(messageview->noticeview,
messageview->msginfo);
+ if (find_broken_part(mimeinfo) != NULL) {
+ noticeview_set_icon(messageview->noticeview,
+ STOCK_PIXMAP_NOTICE_WARN);
+ if (!noticeview_is_visible(messageview->noticeview)) {
+ noticeview_set_text(messageview->noticeview, _("Message doesn't conform to MIME standard. "
+ "It may render wrongly."));
+ gtk_widget_hide(messageview->noticeview->button);
+ gtk_widget_hide(messageview->noticeview->button2);
+ } else {
+ gchar *full = g_strconcat(
+ gtk_label_get_text(GTK_LABEL(messageview->noticeview->text)),
+ "\n",
+ _("Message doesn't conform to MIME standard. "
+ "It may render wrongly."), NULL);
+ noticeview_set_text(messageview->noticeview, full);
+ g_free(full);
+ }
+ noticeview_show(messageview->noticeview);
+ }
+
+ root = mimeinfo;
mimeinfo = procmime_mimeinfo_next(mimeinfo);
- if (!all_headers && mimeinfo
- && (mimeinfo->type != MIMETYPE_TEXT ||
- strcasecmp(mimeinfo->subtype, "plain"))
- && (mimeinfo->type != MIMETYPE_MULTIPART ||
- strcasecmp(mimeinfo->subtype, "signed"))) {
- if (strcasecmp(mimeinfo->subtype, "html")) {
- mimeview_show_part(messageview->mimeview,mimeinfo);
+ if (!all_headers && mimeinfo
+ && (mimeinfo->type != MIMETYPE_TEXT
+ || strcasecmp(mimeinfo->subtype, "plain"))
+ && (mimeinfo->type != MIMETYPE_MULTIPART
+ || strcasecmp(mimeinfo->subtype, "signed"))) {
+ if (strcasecmp(mimeinfo->subtype, "html")) {
+ MimeInfoSearch context = {
+ .parent = root,
+ .current = mimeinfo,
+ .found = NULL
+ };
+ if (mimeview_has_viewer_for_content_type(messageview->mimeview, "text/calendar")) {
+ MimeInfoSearch cal_context = context;
+ messageview_find_part_depth_first(&cal_context, MIMETYPE_TEXT, "calendar");
+ if (cal_context.found) { /* calendar found */
+ mimeinfo = cal_context.found;
+ if (messageview_try_select_mimeinfo(messageview, msginfo, mimeinfo))
+ goto done;
+ }
+ }
+ messageview_find_part_depth_first(&context, MIMETYPE_TEXT, "html");
+ if (context.found &&
+ (msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_ALWAYS ||
+ (msginfo->folder->prefs->promote_html_part == HTML_PROMOTE_DEFAULT &&
+ prefs_common.promote_html_part))) { /* html found */
+ mimeinfo = context.found;
+ if (messageview_try_select_mimeinfo(messageview, msginfo, mimeinfo))
+ goto done;
+ } else
+ mimeinfo = root; /* nothing found */
+
+ if (!mimeview_show_part(messageview->mimeview, mimeinfo))
+ mimeview_select_mimepart_icon(messageview->mimeview, root);
goto done;
} else if (prefs_common.invoke_plugin_on_html) {
mimeview_select_mimepart_icon(messageview->mimeview, mimeinfo);
mimeinfo = procmime_mimeinfo_next(mimeinfo);
}
}
+
+ mimeview_select_mimepart_icon(messageview->mimeview, root);
done:
+ messageview_set_menu_sensitive(messageview);
+ /* plugins may hook in here to work with the message view */
+ hooks_invoke(MESSAGE_VIEW_SHOW_DONE_HOOKLIST, messageview);
+
g_free(file);
return 0;
{
if (!messageview)
return;
- procmsg_msginfo_free(messageview->msginfo);
+ procmsg_msginfo_free(&(messageview->msginfo));
messageview->msginfo = NULL;
messageview->filtered = FALSE;
+
+ if (messageview->window) {
+ gtk_window_set_title(GTK_WINDOW(messageview->window),
+ _("Claws Mail - Message View"));
+ GTK_EVENTS_FLUSH();
+ }
+
mimeview_clear(messageview->mimeview);
headerview_clear(messageview->headerview);
noticeview_hide(messageview->noticeview);
messageview->mainwin->summaryview->displayed = NULL;
messageview->mainwin->summaryview->ext_messageview = NULL;
}
- if (!messageview->deferred_destroy) {
+ if (!messageview->deferred_destroy)
hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
messageview->msginfo_update_callback_id);
- }
if (messageview->updating) {
debug_print("uh oh, better not touch that now (fetching)\n");
mimeview_destroy(messageview->mimeview);
noticeview_destroy(messageview->noticeview);
- procmsg_msginfo_free(messageview->msginfo);
+ procmsg_msginfo_free(&(messageview->msginfo));
toolbar_clear_list(TOOLBAR_MSGVIEW);
if (messageview->toolbar) {
toolbar_destroy(messageview->toolbar);
g_free(messageview->toolbar);
}
-
+
+ list_free_strings(messageview->trail);
+ g_list_free(messageview->trail);
msgview_list = g_list_remove(msgview_list, messageview);
if (messageview->window)
} else {
msginfo = msgview->msginfo;
- g_return_if_fail(msginfo != NULL);
+ cm_return_if_fail(msginfo != NULL);
/* to get the trash folder, we have to choose either
* the folder's or account's trash default - we prefer
trash = folder_get_default_trash();
}
- g_return_if_fail(trash != NULL);
+ cm_return_if_fail(trash != NULL);
if (prefs_common.immediate_exec)
/* TODO: Delete from trash */
/* NOTE: does not update to next message in summaryview */
}
}
-#ifdef MAEMO
- if (msgview->window) {
+#ifdef GENERIC_UMPC
+ if (msgview->window && !prefs_common.always_show_msg) {
messageview_destroy(msgview);
}
#endif
{
SummaryView *summaryview = (SummaryView*)msgview->mainwin->summaryview;
- g_return_if_fail(summaryview != NULL);
+ cm_return_if_fail(summaryview != NULL);
if (summaryview->selected) {
MsgInfo *msginfo = summary_get_selected_msg(summaryview);
static void messageview_size_allocate_cb(GtkWidget *widget,
GtkAllocation *allocation)
{
- g_return_if_fail(allocation != NULL);
+ cm_return_if_fail(allocation != NULL);
prefs_common.msgwin_width = allocation->width;
prefs_common.msgwin_height = allocation->height;
}
-#ifndef MAEMO
+
static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
MessageView *messageview)
{
- if (event && event->keyval == GDK_Escape && messageview->window) {
+ if (event && event->keyval == GDK_KEY_Escape && messageview->window) {
messageview_destroy(messageview);
return TRUE;
}
- if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK|GDK_SHIFT_MASK)) != 0)
+ if (event && (event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0)
+ return FALSE;
+ if (event && (event->state & GDK_SHIFT_MASK) && event->keyval != GDK_KEY_space)
return FALSE;
- g_signal_stop_emission_by_name(G_OBJECT(widget),
- "key_press_event");
- mimeview_pass_key_press_event(messageview->mimeview, event);
- return FALSE;
+ return mimeview_pass_key_press_event(messageview->mimeview, event);
}
-#endif
+
+static void messageview_show_partial_display_cb(NoticeView *noticeview, MessageView *messageview)
+{
+ messageview->show_full_text = TRUE;
+ main_window_cursor_wait(mainwindow_get_mainwindow());
+ noticeview_hide(messageview->noticeview);
+ messageview->partial_display_shown = FALSE;
+ GTK_EVENTS_FLUSH();
+ mimeview_handle_cmd(messageview->mimeview, "sc://display_as_text", NULL, NULL);
+ main_window_cursor_normal(mainwindow_get_mainwindow());
+}
+
+void messageview_show_partial_display(MessageView *messageview, MsgInfo *msginfo,
+ size_t length)
+{
+ gchar *msg = g_strdup_printf(_("Show all %s."), to_human_readable((goffset)length));
+ noticeview_set_icon(messageview->noticeview, STOCK_PIXMAP_NOTICE_WARN);
+ noticeview_set_text(messageview->noticeview, _("Only the first megabyte of text is shown."));
+ noticeview_set_button_text(messageview->noticeview, msg);
+ g_free(msg);
+ noticeview_set_button_press_callback(messageview->noticeview,
+ G_CALLBACK(messageview_show_partial_display_cb),
+ (gpointer) messageview);
+ noticeview_show(messageview->noticeview);
+ messageview->partial_display_shown = TRUE;
+}
+
static void return_receipt_show(NoticeView *noticeview, MsgInfo *msginfo)
{
gchar *addr = NULL;
if (from_me) {
noticeview_set_icon(noticeview, STOCK_PIXMAP_NOTICE_WARN);
if (MSG_IS_RETRCPT_GOT(msginfo->flags)) {
- noticeview_set_text(noticeview, _("You got a return receipt in this message : "
+ noticeview_set_text(noticeview, _("You got a return receipt for this message: "
"it has been displayed by the recipient."));
} else {
noticeview_set_text(noticeview, _("You asked for a return receipt in this message."));
file = procmsg_get_message_file_path(msginfo);
if (!file) {
- g_warning("can't get message file path.\n");
+ g_warning("can't get message file path.");
return;
}
noticeview_hide(noticeview);
}
- procmsg_msginfo_free(tmpmsginfo);
+ procmsg_msginfo_free(&tmpmsginfo);
g_free(file);
}
text = g_strdup_printf(_("This message has been "
"partially retrieved;\nit is %s."),
to_human_readable(
- (off_t)(msginfo->total_size)));
+ (goffset)(msginfo->total_size)));
button1 = _("Mark for download");
button2 = _("Mark for deletion");
button1_cb = partial_recv_dload_clicked;
"partially retrieved;\nit is %s and "
"will be downloaded."),
to_human_readable(
- (off_t)(msginfo->total_size)));
+ (goffset)(msginfo->total_size)));
button1 = _("Unmark");
button1_cb = partial_recv_unmark_clicked;
button2 = _("Mark for deletion");
"partially retrieved;\nit is %s and "
"will be deleted."),
to_human_readable(
- (off_t)(msginfo->total_size)));
+ (goffset)(msginfo->total_size)));
button1 = _("Mark for download");
button1_cb = partial_recv_dload_clicked;
button2 = _("Unmark");
GtkWidget *optmenu;
gint account_id;
- g_return_val_if_fail(ac_list != NULL, NULL);
- g_return_val_if_fail(ac_list->data != NULL, NULL);
+ cm_return_val_if_fail(ac_list != NULL, NULL);
+ cm_return_val_if_fail(ac_list->data != NULL, NULL);
optmenu = gtkut_account_menu_new(ac_list,
G_CALLBACK(select_account_cb),
account_id = ((PrefsAccount *) ac_list->data)->account_id;
if (alertpanel_with_widget(
_("Return Receipt Notification"),
- _("The message was sent to several of your "
- "accounts.\n"
- "Please choose which account do you want to "
+ _("More than one of your accounts uses the "
+ "address that this message was sent to.\n"
+ "Please choose which account you want to "
"use for sending the receipt notification:"),
_("_Cancel"), _("_Send Notification"), NULL,
FALSE, G_ALERTDEFAULT, optmenu) != G_ALERTALTERNATE)
GtkTextView *edit = NULL;
GtkTextBuffer *textbuf;
gint body_pos = 0;
+ GtkTextIter start_iter, end_iter;
+ GtkTextMark *body_start, *body_end;
- g_return_val_if_fail(msgview != NULL, NULL);
+ cm_return_val_if_fail(msgview != NULL, NULL);
if (msgview->mimeview->type == MIMEVIEW_VIEWER) {
MimeViewer *viewer = msgview->mimeview->mimeviewer;
}
textview = messageview_get_current_textview(msgview);
- g_return_val_if_fail(textview != NULL, NULL);
+ cm_return_val_if_fail(textview != NULL, NULL);
edit = GTK_TEXT_VIEW(textview->text);
- g_return_val_if_fail(edit != NULL, NULL);
+ cm_return_val_if_fail(edit != NULL, NULL);
body_pos = textview->body_pos;
textbuf = gtk_text_view_get_buffer(edit);
- if (gtk_text_buffer_get_selection_bounds(textbuf, NULL, NULL))
+ if (gtk_text_buffer_get_selection_bounds(textbuf, NULL, NULL)) {
return gtkut_text_view_get_selection(edit);
- else if (msgview->filtered) {
- GtkTextIter start_iter, end_iter;
- gtk_text_buffer_get_iter_at_offset(textbuf, &start_iter, body_pos);
- gtk_text_buffer_get_end_iter(textbuf, &end_iter);
- gtk_text_buffer_get_text(textbuf, &start_iter, &end_iter, FALSE);
- } else
- text = NULL;
+ } else {
+ if (msgview->filtered) {
+ gtk_text_buffer_get_iter_at_offset(textbuf, &start_iter, body_pos);
+ gtk_text_buffer_get_end_iter(textbuf, &end_iter);
+ } else {
+ body_start = gtk_text_buffer_get_mark(textbuf, "body_start");
+
+ /* If there is no body_start mark, an attachment is likely
+ * selected, and we're looking at instructions on what to do
+ * with it. No point in quoting that, so we'll just return NULL,
+ * so that original message body is quoted instead down the line.
+ */
+ if (body_start == NULL) {
+ return NULL;
+ }
+
+ gtk_text_buffer_get_iter_at_mark(textbuf, &start_iter, body_start);
+
+ body_end = gtk_text_buffer_get_mark(textbuf, "body_end");
+ if (body_end != NULL) /* Just in case */
+ gtk_text_buffer_get_iter_at_mark(textbuf, &end_iter, body_end);
+ else
+ gtk_text_buffer_get_end_iter(textbuf, &end_iter);
+ }
+
+ return gtk_text_buffer_get_text(textbuf, &start_iter, &end_iter, FALSE);
+ }
return text;
}
-static void save_as_cb(gpointer data, guint action, GtkWidget *widget)
+static void save_as_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview_save_as(messageview);
}
-#if defined(USE_GNOMEPRINT) || GTK_CHECK_VERSION(2,10,0)
static void print_mimeview(MimeView *mimeview, gint sel_start, gint sel_end, gint partnum)
{
-#if !defined(USE_GNOMEPRINT) && GTK_CHECK_VERSION(2,10,0)
MainWindow *mainwin;
-#endif
if (!mimeview
|| !mimeview->textview
|| !mimeview->textview->text)
gtk_text_buffer_get_iter_at_offset(buffer, &end, sel_end);
gtk_text_buffer_select_range(buffer, &start, &end);
}
-#if defined(USE_GNOMEPRINT)
- gedit_print(GTK_TEXT_VIEW(mimeview->textview->text));
-#else
/* TODO: Get the real parent window, not the main window */
mainwin = mainwindow_get_mainwindow();
printing_print(GTK_TEXT_VIEW(mimeview->textview->text),
mainwin ? GTK_WINDOW(mainwin->window) : NULL,
- sel_start, sel_end);
-#endif
+ sel_start, sel_end,
+ (mimeview->textview->image
+ ? GTK_IMAGE(mimeview->textview->image)
+ : NULL));
}
}
}
messageview_destroy(tmpview);
}
-#endif
-#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
-static void page_setup_cb(gpointer data, guint action, GtkWidget *widget)
+static void page_setup_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
printing_page_setup(messageview ?
GTK_WINDOW(messageview->window) : NULL);
}
-#endif
-static void print_cb(gpointer data, guint action, GtkWidget *widget)
+static void print_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
-#if !defined(USE_GNOMEPRINT) && !GTK_CHECK_VERSION(2,10,0)
- gchar *cmdline = NULL;
- gchar *p;
-#else
gint sel_start = -1, sel_end = -1, partnum = 0;
-#endif
if (!messageview->msginfo) return;
-#if !defined(USE_GNOMEPRINT) && !GTK_CHECK_VERSION(2,10,0)
- cmdline = input_dialog(_("Print"),
- _("Enter the print command line:\n"
- "('%s' will be replaced with file name)"),
- prefs_common.print_cmd);
- if (!cmdline) return;
- if (!(p = strchr(cmdline, '%')) || *(p + 1) != 's' ||
- strchr(p + 2, '%')) {
- alertpanel_error(_("Print command line is invalid:\n'%s'"),
- cmdline);
- g_free(cmdline);
- return;
- }
- procmsg_print_message(messageview->msginfo, cmdline);
- g_free(cmdline);
-#else
partnum = mimeview_get_selected_part_num(messageview->mimeview);
textview_get_selection_offsets(messageview->mimeview->textview,
&sel_start, &sel_end);
messageview_print(messageview->msginfo, messageview->all_headers,
sel_start, sel_end, partnum);
-#endif
}
-static void close_cb(gpointer data, guint action, GtkWidget *widget)
+static void close_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview_destroy(messageview);
}
-static void copy_cb(gpointer data, guint action, GtkWidget *widget)
+static void copy_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview_copy_clipboard(messageview);
}
-static void allsel_cb(gpointer data, guint action, GtkWidget *widget)
+static void allsel_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview_select_all(messageview);
}
-static void search_cb(gpointer data, guint action, GtkWidget *widget)
+static void search_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
message_search(messageview);
}
-static void prev_cb(gpointer data, guint action, GtkWidget *widget)
+static void prev_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void next_cb(gpointer data, guint action, GtkWidget *widget)
+static void next_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void prev_unread_cb(gpointer data, guint action, GtkWidget *widget)
+static void prev_unread_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void next_unread_cb(gpointer data, guint action, GtkWidget *widget)
+static void next_unread_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void prev_new_cb(gpointer data, guint action, GtkWidget *widget)
+static void prev_new_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void next_new_cb(gpointer data, guint action, GtkWidget *widget)
+static void next_new_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void prev_marked_cb(gpointer data, guint action, GtkWidget *widget)
+static void prev_marked_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void next_marked_cb(gpointer data, guint action, GtkWidget *widget)
+static void next_marked_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void prev_labeled_cb(gpointer data, guint action, GtkWidget *widget)
+static void prev_labeled_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void next_labeled_cb(gpointer data, guint action, GtkWidget *widget)
+static void next_labeled_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void last_read_cb(gpointer data, guint action, GtkWidget *widget)
+static void prev_history_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
- messageview->updating = TRUE;
- summary_select_last_read(messageview->mainwin->summaryview);
- messageview->updating = FALSE;
-
- if (messageview->deferred_destroy) {
- debug_print("messageview got away!\n");
- messageview_destroy(messageview);
- return;
+ MsgInfo *info = messageview_nav_get_prev(messageview);
+ if (info) {
+ messageview->updating = TRUE;
+ messageview_show(messageview, info,
+ messageview->all_headers);
+ messageview->updating = FALSE;
+ procmsg_msginfo_free(&info);
+ if (messageview->deferred_destroy) {
+ debug_print("messageview got away!\n");
+ messageview_destroy(messageview);
+ return;
+ }
}
- if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
- MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
-
- if (msginfo)
- messageview_show(messageview, msginfo,
+}
+
+static void next_history_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+ MsgInfo *info = messageview_nav_get_next(messageview);
+ if (info) {
+ messageview->updating = TRUE;
+ messageview_show(messageview, info,
messageview->all_headers);
-#endif
- } else {
- gtk_widget_destroy(messageview->window);
+ messageview->updating = FALSE;
+ procmsg_msginfo_free(&info);
+ if (messageview->deferred_destroy) {
+ debug_print("messageview got away!\n");
+ messageview_destroy(messageview);
+ return;
+ }
}
}
-static void parent_cb(gpointer data, guint action, GtkWidget *widget)
+static void parent_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void goto_unread_folder_cb(gpointer data, guint action, GtkWidget *widget)
+static void goto_unread_folder_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
+
messageview->updating = TRUE;
- folderview_select_next_unread(messageview->mainwin->folderview, FALSE);
+ folderview_select_next_with_flag(messageview->mainwin->folderview, MSG_UNREAD, FALSE);
messageview->updating = FALSE;
if (messageview->deferred_destroy) {
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void goto_folder_cb(gpointer data, guint action, GtkWidget *widget)
+static void goto_folder_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview->updating = TRUE;
FolderItem *to_folder;
messageview->updating = FALSE;
- to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL);
+ to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL, FALSE);
if (to_folder) {
folderview_select(messageview->mainwin->folderview, to_folder);
return;
}
if (messageview->mainwin->summaryview->selected) {
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
MsgInfo * msginfo = summary_get_selected_msg(messageview->mainwin->summaryview);
if (msginfo)
}
}
-static void set_charset_cb(gpointer data, guint action, GtkWidget *widget)
+static void scroll_prev_line_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+ mimeview_scroll_one_line(messageview->mimeview,TRUE);
+}
+
+static void scroll_next_line_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+ mimeview_scroll_one_line(messageview->mimeview,FALSE);
+}
+
+static void scroll_prev_page_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+ mimeview_scroll_page(messageview->mimeview,TRUE);
+}
+
+static void scroll_next_page_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+ mimeview_scroll_page(messageview->mimeview,FALSE);
+}
+
+static void set_charset_cb(GtkAction *action, GtkRadioAction *current, gpointer data)
{
MessageView *messageview = (MessageView *)data;
+ gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
+ gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
const gchar *charset;
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- charset = conv_get_charset_str((CharSet)action);
+ if (active) {
+ charset = conv_get_charset_str((CharSet)value);
g_free(messageview->forced_charset);
messageview->forced_charset = g_strdup(charset);
procmime_force_charset(charset);
}
}
-static void set_decode_cb(gpointer data, guint action, GtkWidget *widget)
+static void set_decode_cb(GtkAction *action, GtkRadioAction *current, gpointer data)
{
MessageView *messageview = (MessageView *)data;
- if (GTK_CHECK_MENU_ITEM(widget)->active) {
- messageview->forced_encoding = (EncodingType)action;
+ gboolean active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (current));
+ gint value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (current));
+
+ if (active) {
+ messageview->forced_encoding = (EncodingType)value;
messageview_show(messageview, messageview->msginfo, FALSE);
-
- debug_print("forced encoding: %d\n", action);
+ debug_print("forced encoding: %d\n", value);
}
}
-static void view_source_cb(gpointer data, guint action, GtkWidget *widget)
+static void view_source_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
SourceWindow *srcwin;
source_window_show(srcwin);
}
-static void show_all_header_cb(gpointer data, guint action, GtkWidget *widget)
+static void show_all_header_cb(GtkToggleAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
MsgInfo *msginfo = messageview->msginfo;
if (messageview->updating)
return;
- messageview->all_headers =
- GTK_CHECK_MENU_ITEM(widget)->active;
+ messageview->all_headers = prefs_common.show_all_headers =
+ gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
if (!msginfo) return;
messageview->msginfo = NULL;
- messageview_show(messageview, msginfo,
- GTK_CHECK_MENU_ITEM(widget)->active);
- procmsg_msginfo_free(msginfo);
+ messageview_show(messageview, msginfo, messageview->all_headers);
+ procmsg_msginfo_free(&msginfo);
main_window_set_menu_sensitive(messageview->mainwin);
+ summary_redisplay_msg(messageview->mainwin->summaryview);
}
-#define SET_CHECK_MENU_ACTIVE(path, active) \
-{ \
- menuitem = gtk_item_factory_get_widget(ifactory, path); \
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
-}
-
-static void msg_hide_quotes_cb(gpointer data, guint action, GtkWidget *widget)
+static void msg_hide_quotes_cb(GtkToggleAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
MsgInfo *msginfo = messageview->msginfo;
static gboolean updating_menu = FALSE;
- GtkItemFactory *ifactory = gtk_item_factory_from_widget(messageview->menubar);
- GtkWidget *menuitem;
+
if (updating_menu)
return;
-
- prefs_common.hide_quotes =
- GTK_CHECK_MENU_ITEM(widget)->active ? action : 0;
+ if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
+ const gchar *a_name = gtk_action_get_name(GTK_ACTION(action));
+ if (!strcmp(a_name, "View/Quotes/CollapseAll")) prefs_common.hide_quotes = 1;
+ else if (!strcmp(a_name, "View/Quotes/Collapse2")) prefs_common.hide_quotes = 2;
+ else if (!strcmp(a_name, "View/Quotes/Collapse3")) prefs_common.hide_quotes = 3;
+ } else
+ prefs_common.hide_quotes = 0;
updating_menu=TRUE;
- SET_CHECK_MENU_ACTIVE("/View/Quotes/Fold all", FALSE);
- SET_CHECK_MENU_ACTIVE("/View/Quotes/Fold from level 2", FALSE);
- SET_CHECK_MENU_ACTIVE("/View/Quotes/Fold from level 3", FALSE);
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(widget), prefs_common.hide_quotes > 0);
+
+ cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1));
+ cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2));
+ cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse3", (prefs_common.hide_quotes == 3));
+
updating_menu=FALSE;
if (!msginfo) return;
messageview->msginfo = NULL;
messageview_show(messageview, msginfo,
messageview->all_headers);
- procmsg_msginfo_free(msginfo);
+ procmsg_msginfo_free(&msginfo);
/* update main window */
main_window_set_menu_sensitive(messageview->mainwin);
}
#undef SET_CHECK_MENU_ACTIVE
-static void compose_cb(gpointer data, guint action, GtkWidget *widget)
+static void compose_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
PrefsAccount *ac = NULL;
if (item) {
ac = account_find_from_item(item);
if (ac && ac->protocol == A_NNTP &&
- item->stype == F_NEWS) {
+ FOLDER_TYPE(item->folder) == F_NEWS) {
compose_new(ac, item->path, NULL);
return;
}
compose_new(ac, NULL, NULL);
}
-static void reply_cb(gpointer data, guint action, GtkWidget *widget)
+#define DO_ACTION(name, act) { if (!strcmp(a_name, name)) action = act; }
+
+static void reply_cb(GtkAction *gaction, gpointer data)
{
MessageView *messageview = (MessageView *)data;
GSList *msginfo_list = NULL;
+ gint action = COMPOSE_REPLY;
+ const gchar *a_name = gtk_action_get_name(gaction);
+
+ cm_return_if_fail(messageview->msginfo);
- g_return_if_fail(messageview->msginfo);
+ DO_ACTION("Message/Reply", COMPOSE_REPLY);
+ DO_ACTION("Message/ReplyTo/All", COMPOSE_REPLY_TO_ALL);
+ DO_ACTION("Message/ReplyTo/Sender", COMPOSE_REPLY_TO_SENDER);
+ DO_ACTION("Message/ReplyTo/List", COMPOSE_REPLY_TO_LIST);
+ DO_ACTION("Message/Forward", COMPOSE_FORWARD_INLINE);
+ DO_ACTION("Message/ForwardAtt", COMPOSE_FORWARD_AS_ATTACH);
+ DO_ACTION("Message/Redirect", COMPOSE_REDIRECT);
msginfo_list = g_slist_append(msginfo_list, messageview->msginfo);
compose_reply_from_messageview(messageview, msginfo_list, action);
g_slist_free(msginfo_list);
}
-static void addressbook_open_cb(gpointer data, guint action, GtkWidget *widget)
+static void addressbook_open_cb(GtkAction *action, gpointer data)
{
+#ifndef USE_ALT_ADDRBOOK
addressbook_open(NULL);
+#else
+ GError* error = NULL;
+
+ addressbook_dbus_open(FALSE, &error);
+ if (error) {
+ g_warning("Failed to open address book: %s", error->message);
+ g_error_free(error);
+ }
+#endif
}
-static void add_address_cb(gpointer data, guint action, GtkWidget *widget)
+static void add_address_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
MsgInfo *msginfo, *full_msginfo;
gchar *from;
- GtkWidget *image = NULL;
GdkPixbuf *picture = NULL;
+ AvatarRender *avatarr;
if (!messageview->msginfo || !messageview->msginfo->from)
return;
extract_address(from);
full_msginfo = procmsg_msginfo_get_full_info(msginfo);
- if (full_msginfo &&
- full_msginfo->extradata &&
- full_msginfo->extradata->face) {
- image = face_get_from_header(full_msginfo->extradata->face);
- }
-#if HAVE_LIBCOMPFACE
- else if (full_msginfo &&
- full_msginfo->extradata &&
- full_msginfo->extradata->xface) {
- image = xface_get_from_header(full_msginfo->extradata->xface,
- &messageview->mainwin->summaryview->ctree->style->white,
- messageview->window->window);
- }
-#endif
- procmsg_msginfo_free(full_msginfo);
- if (image)
- picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
- addressbook_add_contact(msginfo->fromname, from, NULL, picture);
+ avatarr = avatars_avatarrender_new(full_msginfo);
+ hooks_invoke(AVATAR_IMAGE_RENDER_HOOKLIST, avatarr);
- if (image)
- gtk_widget_destroy(image);
+ procmsg_msginfo_free(&full_msginfo);
+
+ if (avatarr->image != NULL)
+ picture = gtk_image_get_pixbuf(GTK_IMAGE(avatarr->image));
+
+#ifndef USE_ALT_ADDRBOOK
+ addressbook_add_contact(msginfo->fromname, from, NULL, picture);
+#else
+ if (addressadd_selection(msginfo->fromname, from, NULL, picture)) {
+ debug_print( "addressbook_add_contact - added\n" );
+ }
+#endif
+ avatars_avatarrender_free(avatarr);
}
-static void create_filter_cb(gpointer data, guint action, GtkWidget *widget)
+static void create_filter_cb(GtkAction *gaction, gpointer data)
{
MessageView *messageview = (MessageView *)data;
FolderItem * item;
-
+ gint action = -1;
+ const gchar *a_name = gtk_action_get_name(gaction);
+
if (!messageview->msginfo) return;
+
+ DO_ACTION("Tools/CreateFilterRule/Automatically", FILTER_BY_AUTO);
+ DO_ACTION("Tools/CreateFilterRule/ByFrom", FILTER_BY_FROM);
+ DO_ACTION("Tools/CreateFilterRule/ByTo", FILTER_BY_TO);
+ DO_ACTION("Tools/CreateFilterRule/BySubject", FILTER_BY_SUBJECT);
item = messageview->msginfo->folder;
summary_msginfo_filter_open(item, messageview->msginfo,
(PrefsFilterType)action, 0);
}
-static void create_processing_cb(gpointer data, guint action,
- GtkWidget *widget)
+static void create_processing_cb(GtkAction *gaction, gpointer data)
{
MessageView *messageview = (MessageView *)data;
FolderItem * item;
+ gint action = -1;
+ const gchar *a_name = gtk_action_get_name(gaction);
if (!messageview->msginfo) return;
+ DO_ACTION("Tools/CreateProcessingRule/Automatically", FILTER_BY_AUTO);
+ DO_ACTION("Tools/CreateProcessingRule/ByFrom", FILTER_BY_FROM);
+ DO_ACTION("Tools/CreateProcessingRule/ByTo", FILTER_BY_TO);
+ DO_ACTION("Tools/CreateProcessingRule/BySubject", FILTER_BY_SUBJECT);
+
item = messageview->msginfo->folder;
summary_msginfo_filter_open(item, messageview->msginfo,
(PrefsFilterType)action, 1);
}
-static void open_urls_cb(gpointer data, guint action, GtkWidget *widget)
+static void open_urls_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
messageview_list_urls(messageview);
}
-static void about_cb(gpointer data, guint action, GtkWidget *widget)
+static void about_cb(GtkAction *gaction, gpointer data)
{
about_show();
}
{
MsgInfoUpdate *msginfo_update = (MsgInfoUpdate *) source;
MessageView *messageview = (MessageView *)data;
+ MsgInfo *old_msginfo = messageview->msginfo;
if (messageview->msginfo != msginfo_update->msginfo)
return FALSE;
- if (msginfo_update->flags & MSGINFO_UPDATE_DELETED) {
- MsgInfo *old_msginfo = messageview->msginfo;
- messageview_clear(messageview);
- messageview_update(messageview, old_msginfo);
- }
+ if ((msginfo_update->flags & MSGINFO_UPDATE_DELETED) ||
+ MSG_IS_DELETED(old_msginfo->flags))
+ {
+ if (messageview->new_window) {
+ if (old_msginfo->folder && old_msginfo->folder->total_msgs == 0) {
+ messageview_clear(messageview);
+ textview_show_info(messageview->mimeview->textview,
+ _("\n There are no messages in this folder"));
+ return FALSE;
+ }
+
+ if (!prefs_common.always_show_msg) {
+ messageview_clear(messageview);
+ textview_show_info(messageview->mimeview->textview,
+ MSG_IS_DELETED(old_msginfo->flags) ?
+ _("\n Message has been deleted") :
+ _("\n Message has been deleted or moved to another folder"));
+ } else
+ messageview->update_needed = TRUE;
+
+ } else {
+ messageview_clear(messageview);
+ messageview_update(messageview, old_msginfo);
+ }
+ }
return FALSE;
}
void messageview_set_menu_sensitive(MessageView *messageview)
{
- GtkItemFactory *ifactory;
- GtkWidget *menuitem = NULL;
-
- if (!messageview || !messageview->new_window)
+ if (!messageview || !messageview->ui_manager)
return;
- /* do some smart things */
- if (!messageview->menubar) return;
- ifactory = gtk_item_factory_from_widget(messageview->menubar);
- if (!ifactory) return;
-
- if (prefs_common.hide_quotes) {
- menuitem = NULL;
- if (prefs_common.hide_quotes == 1)
- menuitem = gtk_item_factory_get_widget(ifactory,
- "/View/Quotes/Fold all");
- if (prefs_common.hide_quotes == 2)
- menuitem = gtk_item_factory_get_widget(ifactory,
- "/View/Quotes/Fold from level 2");
- if (prefs_common.hide_quotes == 3)
- menuitem = gtk_item_factory_get_widget(ifactory,
- "/View/Quotes/Fold from level 3");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem),
- TRUE);
- }
+
+ cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/CollapseAll", (prefs_common.hide_quotes == 1));
+ cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse2", (prefs_common.hide_quotes == 2));
+ cm_toggle_menu_set_active_full(messageview->ui_manager, "Menu/View/Quotes/Collapse3", (prefs_common.hide_quotes == 3));
+ cm_menu_set_sensitive_full(messageview->ui_manager, "Menu/View/Goto/PrevHistory", messageview_nav_has_prev(messageview));
+ cm_menu_set_sensitive_full(messageview->ui_manager, "Menu/View/Goto/NextHistory", messageview_nav_has_next(messageview));
+
+ cm_menu_set_sensitive_full(messageview->ui_manager, "Menu/Message/CheckSignature", messageview->mimeview->signed_part);
}
void messageview_learn (MessageView *msgview, gboolean is_spam)
{
GSList *cur = msgview->mimeview->textview->uri_list;
GSList *newlist = NULL;
- GHashTable *uri_hashtable = g_hash_table_new(g_str_hash, g_str_equal);
+ GHashTable *uri_hashtable;
+ gchar *tmp;
+
+ uri_hashtable = g_hash_table_new_full(g_str_hash, g_str_equal,
+ (GDestroyNotify) g_free, NULL);
+
for (; cur; cur = cur->next) {
ClickableText *uri = (ClickableText *)cur->data;
if (uri->uri &&
!g_ascii_strncasecmp(uri->uri, "http:", 5) ||
!g_ascii_strncasecmp(uri->uri, "https:", 6)))
{
- if(g_hash_table_lookup(uri_hashtable, uri->uri))
+ tmp = g_utf8_strdown(uri->uri, -1);
+
+ if (g_hash_table_lookup(uri_hashtable, tmp)) {
+ g_free(tmp);
continue;
+ }
newlist = g_slist_prepend(newlist, uri);
- g_hash_table_insert(uri_hashtable, uri->uri,
- GUINT_TO_POINTER(g_str_hash(uri->uri)));
+ g_hash_table_insert(uri_hashtable, tmp,
+ GUINT_TO_POINTER(g_str_hash(tmp)));
}
}
newlist = g_slist_reverse(newlist);
g_slist_free(newlist);
g_hash_table_destroy(uri_hashtable);
}
+
+static void save_part_as_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+
+ if (messageview->mimeview)
+ mimeview_save_as(messageview->mimeview);
+}
+
+static void view_part_as_text_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+
+ if (messageview->mimeview)
+ mimeview_display_as_text(messageview->mimeview);
+}
+
+static void open_part_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+
+ if (messageview->mimeview)
+ mimeview_launch(messageview->mimeview, NULL);
+}
+#ifndef G_OS_WIN32
+static void open_part_with_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+
+ if (messageview->mimeview)
+ mimeview_open_with(messageview->mimeview);
+}
+#endif
+static void check_signature_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+
+ if (messageview->mimeview)
+ mimeview_check_signature(messageview->mimeview);
+}
+
+static void goto_next_part_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+
+ if (messageview->mimeview)
+ mimeview_select_next_part(messageview->mimeview);
+}
+
+static void goto_prev_part_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+
+ if (messageview->mimeview)
+ mimeview_select_prev_part(messageview->mimeview);
+}
+
projects / claws.git / blobdiff