/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 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/>.
- *
+ *
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
+#ifdef G_OS_WIN32
+#define UNICODE
+#define _UNICODE
+#endif
+
#include <glib.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <sys/types.h>
#include <sys/stat.h>
-#ifndef HAVE_APACHE_FNMATCH
-/* kludge: apache's fnmatch clashes with <regex.h>, don't include
- * fnmatch.h */
-#include <fnmatch.h>
-#endif
-
#include "main.h"
#include "mimeview.h"
#include "textview.h"
#include "gtk/gtkvscrollbutton.h"
#include "gtk/logwindow.h"
#include "timing.h"
-
-#ifdef MAEMO
-#include <libosso.h>
-#ifndef CHINOOK
-#include <osso-mime.h>
-#else
-#include <hildon-mime.h>
-#endif
-#endif
+#include "manage_window.h"
+#include "privacy.h"
typedef enum
{
COL_MIMETYPE = 0,
COL_SIZE = 1,
- COL_NAME = 2
+ COL_NAME = 2,
+ COL_DATA = 3,
} MimeViewColumnPos;
-#define N_MIMEVIEW_COLS 3
+#define N_MIMEVIEW_COLS 4
static void mimeview_set_multipart_tree (MimeView *mimeview,
MimeInfo *mimeinfo,
- GtkCMCTreeNode *parent);
-static GtkCMCTreeNode *mimeview_append_part (MimeView *mimeview,
- MimeInfo *partinfo,
- GtkCMCTreeNode *parent);
+ GtkTreeIter *parent);
static void mimeview_show_message_part (MimeView *mimeview,
MimeInfo *partinfo);
static void mimeview_change_view_type (MimeView *mimeview,
static gboolean mimeview_write_part (const gchar *filename,
MimeInfo *partinfo);
-static void mimeview_selected (GtkCMCTree *ctree,
- GtkCMCTreeNode *node,
- gint column,
- MimeView *mimeview);
-static void mimeview_start_drag (GtkWidget *widget,
- gint button,
- GdkEvent *event,
+static void mimeview_selected (GtkTreeSelection *selection,
MimeView *mimeview);
static gint mimeview_button_pressed (GtkWidget *widget,
GdkEventButton *event,
static gboolean mimeview_scrolled (GtkWidget *widget,
GdkEventScroll *event,
MimeView *mimeview);
-static void mimeview_display_as_text (MimeView *mimeview);
-static void mimeview_save_as (MimeView *mimeview);
+
static void mimeview_save_all (MimeView *mimeview);
-static void mimeview_launch (MimeView *mimeview,
- MimeInfo *partinfo);
#ifndef G_OS_WIN32
-static void mimeview_open_with (MimeView *mimeview);
static void mimeview_open_part_with (MimeView *mimeview,
MimeInfo *partinfo,
gboolean automatic);
#endif
-static void mimeview_select_next_part (MimeView *mimeview);
-static void mimeview_select_prev_part (MimeView *mimeview);
+static void mimeview_send_to (MimeView *mimeview,
+ MimeInfo *partinfo);
static void mimeview_view_file (const gchar *filename,
MimeInfo *partinfo,
const gchar *cmd,
static void icon_list_clear (MimeView *mimeview);
static void icon_list_toggle_by_mime_info (MimeView *mimeview,
MimeInfo *mimeinfo);
+static void ctree_size_allocate_cb (GtkWidget *widget,
+ GtkAllocation *allocation,
+ MimeView *mimeview);
static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
MimeView *mimeview);
static gboolean part_button_pressed (MimeView *mimeview,
GtkAllocation *layout_size,
MimeView *mimeview);
static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview);
+static const gchar *get_part_name(MimeInfo *partinfo);
+static const gchar *get_part_description(MimeInfo *partinfo);
static void mimeview_launch_cb(GtkAction *action, gpointer data)
{
}
#endif
+static void mimeview_send_to_cb(GtkAction *action, gpointer data)
+{
+ MimeView *mimeview = (MimeView *)data;
+ mimeview_send_to(mimeview, mimeview_get_part_to_use(mimeview));
+}
+
static void mimeview_display_as_text_cb(GtkAction *action, gpointer data)
{
mimeview_display_as_text((MimeView *)data);
mimeview_select_next_part((MimeView *)data);
}
+static void mimeview_select_prev_part_cb(GtkAction *action, gpointer data)
+{
+ mimeview_select_prev_part((MimeView *)data);
+}
+
static GtkActionEntry mimeview_menu_actions[] = {
{ "MimeView", NULL, "MimeView" },
- { "MimeView/Open", NULL, N_("_Open (l)"), NULL, "Open MIME part", G_CALLBACK(mimeview_launch_cb) },
-#if (!defined MAEMO && !defined G_OS_WIN32)
- { "MimeView/OpenWith", NULL, N_("Open _with (o)..."), NULL, "Open MIME part with...", G_CALLBACK(mimeview_open_with_cb) },
+ { "MimeView/Open", NULL, N_("_Open"), NULL, "Open MIME part", G_CALLBACK(mimeview_launch_cb) },
+#if (!defined G_OS_WIN32)
+ { "MimeView/OpenWith", NULL, N_("Open _with..."), NULL, "Open MIME part with...", G_CALLBACK(mimeview_open_with_cb) },
#endif
- { "MimeView/DisplayAsText", NULL, N_("_Display as text (t)"), NULL, "Display as text", G_CALLBACK(mimeview_display_as_text_cb) },
- { "MimeView/SaveAs", NULL, N_("_Save as (y)..."), NULL, "Save as", G_CALLBACK(mimeview_save_as_cb) },
+ { "MimeView/SendTo", NULL, N_("Send to..."), NULL, "Send to", G_CALLBACK(mimeview_send_to_cb) },
+ { "MimeView/DisplayAsText", NULL, N_("_Display as text"), NULL, "Display as text", G_CALLBACK(mimeview_display_as_text_cb) },
+ { "MimeView/SaveAs", NULL, N_("_Save as..."), NULL, "Save as", G_CALLBACK(mimeview_save_as_cb) },
{ "MimeView/SaveAll", NULL, N_("Save _all..."), NULL, "Save all parts", G_CALLBACK(mimeview_save_all_cb) },
- { "MimeView/NextPart", NULL, N_("Next part (a)"), NULL, "Next part", G_CALLBACK(mimeview_select_next_part_cb) }
+ { "MimeView/NextPart", NULL, N_("Next part"), NULL, "Next part", G_CALLBACK(mimeview_select_next_part_cb) },
+ { "MimeView/PrevPart", NULL, N_("Previous part"), NULL, "Previous part", G_CALLBACK(mimeview_select_prev_part_cb) }
};
static GtkTargetEntry mimeview_mime_types[] =
GdkEventVisibility *event,
MimeView *mimeview)
{
- gdk_window_set_cursor(widget->window, hand_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), hand_cursor);
return FALSE;
}
GdkEventCrossing *event,
MimeView *mimeview)
{
- gdk_window_set_cursor(widget->window, NULL);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
return FALSE;
}
GdkEventCrossing *event,
MimeView *mimeview)
{
- gdk_window_set_cursor(widget->window, hand_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), hand_cursor);
return FALSE;
}
GtkWidget *hbox;
NoticeView *siginfoview;
GtkRequisition r;
+ GtkTreeStore *model;
+ GtkCellRenderer *renderer;
+ GtkTreeViewColumn *column;
+ GtkTreeSelection *selection;
gchar *titles[N_MIMEVIEW_COLS];
- gint i;
- CLAWS_TIP_DECL();
+ gint cols;
if (!hand_cursor)
hand_cursor = gdk_cursor_new(GDK_HAND2);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
+
+ model = gtk_tree_store_new(N_MIMEVIEW_COLS,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_STRING,
+ G_TYPE_POINTER);
+
+ ctree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+ gtk_tree_view_set_enable_search(GTK_TREE_VIEW(ctree), FALSE);
+ gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(ctree),
+ prefs_common.use_stripes_everywhere);
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(ctree),
+ prefs_common.show_col_headers);
+
+ renderer = gtk_cell_renderer_text_new();
+ cols = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ctree),
+ -1, titles[COL_MIMETYPE],renderer,
+ "text", COL_MIMETYPE, NULL);
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(ctree), cols-1);
+
+ renderer = gtk_cell_renderer_text_new();
+#if(GTK_CHECK_VERSION(2,18,0))
+ gtk_cell_renderer_set_alignment(renderer, 1, 0.5);
+#endif
+ cols = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ctree),
+ -1, titles[COL_SIZE], renderer,
+ "text", COL_SIZE, NULL);
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(ctree), cols-1);
+ gtk_tree_view_column_set_alignment(GTK_TREE_VIEW_COLUMN(column), 1);
+
+ renderer = gtk_cell_renderer_text_new();
+ cols = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ctree),
+ -1, titles[COL_NAME], renderer,
+ "text", COL_NAME, NULL);
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(ctree), cols-1);
+ gtk_tree_view_column_set_expand(GTK_TREE_VIEW_COLUMN(column), TRUE);
+
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(ctree));
+ gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
- ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
gtk_widget_show(ctree);
- gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
- gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
- gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), COL_SIZE,
- GTK_JUSTIFY_RIGHT);
- gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_MIMETYPE, 240);
- gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_SIZE, 90);
- for (i = 0; i < N_MIMEVIEW_COLS; i++)
- GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
- GTK_CAN_FOCUS);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
+ gtk_drag_source_set(ctree, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
+ mimeview_mime_types, 1, GDK_ACTION_COPY);
- g_signal_connect(G_OBJECT(ctree), "tree_select_row",
+ g_signal_connect(G_OBJECT(selection), "changed",
G_CALLBACK(mimeview_selected), mimeview);
g_signal_connect(G_OBJECT(ctree), "button_release_event",
G_CALLBACK(mimeview_button_pressed), mimeview);
g_signal_connect(G_OBJECT(ctree), "key_press_event",
G_CALLBACK(mimeview_key_pressed), mimeview);
- g_signal_connect(G_OBJECT (ctree),"start_drag",
- G_CALLBACK (mimeview_start_drag), mimeview);
g_signal_connect(G_OBJECT(ctree), "drag_data_get",
G_CALLBACK(mimeview_drag_data_get), mimeview);
mime_notebook = gtk_notebook_new();
gtk_widget_show(mime_notebook);
- GTK_WIDGET_UNSET_FLAGS(mime_notebook, GTK_CAN_FOCUS);
+ gtkut_widget_set_can_focus(mime_notebook, FALSE);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(mime_notebook), FALSE);
gtk_notebook_set_show_border(GTK_NOTEBOOK(mime_notebook), FALSE);
mime_toggle = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(mime_toggle), FALSE);
- g_signal_connect(G_OBJECT(mime_toggle), "visibility-notify-event",
- G_CALLBACK(mimeview_visi_notify), mimeview);
g_signal_connect(G_OBJECT(mime_toggle), "motion-notify-event",
G_CALLBACK(mimeview_visi_notify), mimeview);
g_signal_connect(G_OBJECT(mime_toggle), "leave-notify-event",
ctree_mainbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
+ g_signal_connect(G_OBJECT(ctree_mainbox), "size_allocate",
+ G_CALLBACK(ctree_size_allocate_cb), mimeview);
mimeview->ui_manager = gtk_ui_manager_new();
mimeview->action_group = cm_menu_create_action_group_full(mimeview->ui_manager,
MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "Open", "MimeView/Open",
GTK_UI_MANAGER_MENUITEM);
-#if (!defined MAEMO && !defined G_OS_WIN32)
+#if (!defined G_OS_WIN32)
MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "OpenWith", "MimeView/OpenWith",
GTK_UI_MANAGER_MENUITEM);
#endif
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "SendTo", "MimeView/SendTo",
+ GTK_UI_MANAGER_MENUITEM);
MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "DisplayAsText", "MimeView/DisplayAsText",
GTK_UI_MANAGER_MENUITEM);
MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
"/Menus/MimeView/", "NextPart", "MimeView/NextPart",
GTK_UI_MANAGER_MENUITEM);
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "PrevPart", "MimeView/PrevPart",
+ GTK_UI_MANAGER_MENUITEM);
popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
gtk_ui_manager_get_widget(mimeview->ui_manager, "/Menus/MimeView")) );
mimeview->icon_mainbox = icon_mainbox;
mimeview->icon_count = 0;
mimeview->mainwin = mainwin;
-#if !(GTK_CHECK_VERSION(2,12,0))
- mimeview->tooltips = tips;
-#endif
- mimeview->oldsize = 60;
mimeview->mime_toggle = mime_toggle;
mimeview->siginfoview = siginfoview;
mimeview->scrollbutton = scrollbutton;
void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
const gchar *file)
{
- GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
- GtkCMCTreeNode *node;
+ GtkTreeView *ctree = GTK_TREE_VIEW(mimeview->ctree);
mimeview_clear(mimeview);
- g_return_if_fail(file != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(file != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
mimeview->mimeinfo = mimeinfo;
debug_print("signed mail\n");
mimeview_set_multipart_tree(mimeview, mimeinfo, NULL);
+ gtk_tree_view_expand_all(ctree);
icon_list_clear(mimeview);
icon_list_create(mimeview, mimeinfo);
-
+
g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
mimeview_selected, mimeview);
-
- node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
- if (node) {
- gtk_cmctree_select(ctree, node);
- icon_list_toggle_by_mime_info
- (mimeview, gtk_cmctree_node_get_row_data(ctree, node));
- gtkut_ctree_set_focus_row(ctree, node);
- }
}
#ifdef USE_PTHREAD
g_slist_free(mimeview->viewers);
gtk_target_list_unref(mimeview->target_list);
- mimeview_free_mimeinfo(mimeview);
#ifdef USE_PTHREAD
if (mimeview->check_data) {
mimeview->check_data->destroy_mimeview = TRUE;
} else
#endif
{
+ mimeview_free_mimeinfo(mimeview);
+ gtk_tree_path_free(mimeview->opened);
g_free(mimeview->file);
g_free(mimeview);
mimeviews = g_slist_remove(mimeviews, mimeview);
MimeInfo *mimeview_get_selected_part(MimeView *mimeview)
{
- return gtk_cmctree_node_get_row_data
- (GTK_CMCTREE(mimeview->ctree), mimeview->opened);
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(mimeview->ctree));
+ GtkTreeIter iter;
+ GtkTreeSelection *selection;
+ MimeInfo *partinfo = NULL;
+
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(mimeview->ctree));
+ if (gtk_tree_selection_get_selected(selection, NULL, &iter))
+ gtk_tree_model_get(model, &iter, COL_DATA, &partinfo, -1);
+
+ return partinfo;
+}
+
+MimeInfo *mimeview_get_node_part(MimeView *mimeview, GtkTreePath *path)
+{
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(mimeview->ctree));
+ GtkTreeIter iter;
+ MimeInfo *partinfo;
+
+ gtk_tree_model_get_iter(model, &iter, path);
+ gtk_tree_model_get(model, &iter, COL_DATA, &partinfo, -1);
+ return partinfo;
+}
+
+gboolean mimeview_tree_is_empty(MimeView *mimeview)
+{
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(mimeview->ctree));
+ GtkTreeIter iter;
+ return !gtk_tree_model_get_iter_first(model, &iter);
+}
+
+static gboolean mimeview_tree_next(GtkTreeModel *model, GtkTreePath *path)
+{
+ GtkTreeIter iter, parent;
+ gboolean has_parent;
+
+ gtk_tree_model_get_iter(model, &iter, path);
+
+ if (gtk_tree_model_iter_has_child(model, &iter)) {
+ gtk_tree_path_down(path);
+ return TRUE;
+ }
+
+ has_parent = gtk_tree_model_iter_parent(model, &parent, &iter);
+
+ if (!gtk_tree_model_iter_next(model, &iter)) {
+ while (has_parent) {
+ GtkTreeIter saved_parent = parent;
+ gtk_tree_path_up(path);
+ if (gtk_tree_model_iter_next(model, &parent)) {
+ gtk_tree_path_next(path);
+ return TRUE;
+ } else {
+ has_parent = gtk_tree_model_iter_parent(model, &parent, &saved_parent);
+ }
+ }
+
+ } else {
+ gtk_tree_path_next(path);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static gboolean mimeview_tree_prev(MimeView *mimeview, GtkTreePath *path)
+{
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(mimeview->ctree));
+ GtkTreeIter iter, child, parent;
+ gboolean has_parent;
+
+ gtk_tree_model_get_iter(model, &iter, path);
+ has_parent = gtk_tree_model_iter_parent(model, &parent, &iter);
+
+ if (gtk_tree_path_prev(path)) {
+ gtk_tree_model_get_iter(model, &iter, path);
+
+ if (gtk_tree_model_iter_nth_child(model, &child, &iter, 0)) {
+ gtk_tree_path_down(path);
+
+ while (gtk_tree_model_iter_next(model, &child))
+ gtk_tree_path_next(path);
+ }
+
+ return TRUE;
+ }
+
+ if (has_parent) {
+ gtk_tree_path_up(path);
+ return TRUE;
+ }
+
+ return FALSE;
}
gint mimeview_get_selected_part_num(MimeView *mimeview)
{
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(mimeview->ctree));
+ GtkTreeIter iter;
+ GtkTreePath *path;
gint i = 0;
- GList *rows = GTK_CMCLIST(mimeview->ctree)->row_list;
- while (rows) {
- if (mimeview->opened == GTK_CMCTREE_NODE(rows))
+
+ gtk_tree_model_get_iter_first(model, &iter);
+ path = gtk_tree_model_get_path(model, &iter);
+
+ do {
+ if (!gtk_tree_path_compare(mimeview->opened, path)) {
+ gtk_tree_path_free(path);
return i;
+ }
+
i++;
- rows = rows->next;
- }
+ } while (mimeview_tree_next(model, path));
+
+ gtk_tree_path_free(path);
+
return -1;
}
void mimeview_select_part_num(MimeView *mimeview, gint i)
{
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(mimeview->ctree));
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ GtkTreeSelection *selection;
+ gint x = 0;
+
if (i < 0)
return;
- gtk_cmclist_unselect_all(GTK_CMCLIST(mimeview->ctree));
- gtk_cmclist_select_row(GTK_CMCLIST(mimeview->ctree), i, -1);
- gtkut_clist_set_focus_row(GTK_CMCLIST(mimeview->ctree), i);
+
+ gtk_tree_model_get_iter_first(model, &iter);
+ path = gtk_tree_model_get_path(model, &iter);
+
+ while (x != i) {
+ if (!mimeview_tree_next(model, path)) {
+ gtk_tree_path_free(path);
+ return;
+ }
+ x++;
+ }
+
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(mimeview->ctree));
+ gtk_tree_selection_select_path(selection, path);
+ gtk_tree_path_free(path);
}
static void mimeview_set_multipart_tree(MimeView *mimeview,
MimeInfo *mimeinfo,
- GtkCMCTreeNode *parent)
+ GtkTreeIter *parent)
{
- GtkCMCTreeNode *node;
+ GtkTreeStore *model = GTK_TREE_STORE(gtk_tree_view_get_model(
+ GTK_TREE_VIEW(mimeview->ctree)));
+ GtkTreeIter iter;
+ gchar *content_type, *length, *name;
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
while (mimeinfo != NULL) {
- node = mimeview_append_part(mimeview, mimeinfo, parent);
+ if (mimeinfo->type != MIMETYPE_UNKNOWN && mimeinfo->subtype)
+ content_type = g_strdup_printf("%s/%s",
+ procmime_get_media_type_str(mimeinfo->type),
+ mimeinfo->subtype);
+ else
+ content_type = g_strdup("UNKNOWN");
+
+ length = g_strdup(to_human_readable((goffset) mimeinfo->length));
+
+ if (prefs_common.attach_desc)
+ name = g_strdup(get_part_description(mimeinfo));
+ else
+ name = g_strdup(get_part_name(mimeinfo));
+
+ gtk_tree_store_append(model, &iter, parent);
+ gtk_tree_store_set(model, &iter,
+ COL_MIMETYPE, content_type,
+ COL_SIZE, length,
+ COL_NAME, name,
+ COL_DATA, mimeinfo, -1);
+ g_free(content_type);
+ g_free(length);
+ g_free(name);
if (mimeinfo->node->children)
- mimeview_set_multipart_tree(mimeview, (MimeInfo *) mimeinfo->node->children->data, node);
- mimeinfo = mimeinfo->node->next != NULL ? (MimeInfo *) mimeinfo->node->next->data : NULL;
+ mimeview_set_multipart_tree(mimeview,
+ (MimeInfo *) mimeinfo->node->children->data, &iter);
+ mimeinfo = mimeinfo->node->next != NULL ?
+ (MimeInfo *) mimeinfo->node->next->data : NULL;
}
}
return get_part_name(partinfo);
}
-static GtkCMCTreeNode *mimeview_append_part(MimeView *mimeview,
- MimeInfo *partinfo,
- GtkCMCTreeNode *parent)
-{
- GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
- GtkCMCTreeNode *node;
- static gchar content_type[64];
- gchar *str[N_MIMEVIEW_COLS];
-
- if (partinfo->type != MIMETYPE_UNKNOWN && partinfo->subtype) {
- g_snprintf(content_type, 64, "%s/%s", procmime_get_media_type_str(partinfo->type), partinfo->subtype);
- } else {
- g_snprintf(content_type, 64, "UNKNOWN");
- }
-
- str[COL_MIMETYPE] = content_type;
- str[COL_SIZE] = to_human_readable((goffset)partinfo->length);
- if (prefs_common.attach_desc)
- str[COL_NAME] = (gchar *) get_part_description(partinfo);
- else
- str[COL_NAME] = (gchar *) get_part_name(partinfo);
-
- node = gtk_sctree_insert_node(ctree, parent, NULL, str, 0,
- NULL, NULL,
- FALSE, TRUE);
- gtk_cmctree_node_set_row_data(ctree, node, partinfo);
-
- return node;
-}
-
static void mimeview_show_message_part(MimeView *mimeview, MimeInfo *partinfo)
{
FILE *fp;
GSList *cur;
MimeViewerFactory *factory = NULL;
MimeViewer *viewer = NULL;
- gchar *real_contenttype = NULL;
+ gchar *real_contenttype = NULL, *tmp;
-/*
- * FNM_CASEFOLD is a GNU extension
- */
-#ifndef FNM_CASEFOLD
-#define FNM_CASEFOLD 0
real_contenttype = g_utf8_strdown((gchar *)content_type, -1);
-#else
- real_contenttype = g_strdup(content_type);
-#endif
for (cur = mimeviewer_factories; cur != NULL; cur = g_slist_next(cur)) {
MimeViewerFactory *curfactory = cur->data;
gint i = 0;
while (curfactory->content_types[i] != NULL) {
- if(!fnmatch(curfactory->content_types[i], real_contenttype, FNM_CASEFOLD)) {
+ tmp = g_utf8_strdown(curfactory->content_types[i], -1);
+ if (g_pattern_match_simple(tmp, real_contenttype)) {
debug_print("%s\n", curfactory->content_types[i]);
factory = curfactory;
+ g_free(tmp);
break;
}
+ g_free(tmp);
i++;
}
if (factory != NULL)
if (mimeview->mimeviewer != NULL)
mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
- if (mimeview->mimeviewer != viewer) {
+ if (mimeview->mimeviewer != viewer)
mimeview->mimeviewer = viewer;
- mimeview_change_view_type(mimeview, MIMEVIEW_VIEWER);
- }
+
+ mimeview_change_view_type(mimeview, MIMEVIEW_VIEWER);
viewer->mimeview = mimeview;
viewer->show_mimepart(viewer, mimeview->file, partinfo);
void mimeview_clear(MimeView *mimeview)
{
- GtkCMCList *clist = NULL;
+ GtkTreeModel *model;
if (!mimeview)
return;
if (g_slist_find(mimeviews, mimeview) == NULL)
return;
- clist = GTK_CMCLIST(mimeview->ctree);
-
noticeview_hide(mimeview->siginfoview);
- gtk_cmclist_clear(clist);
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(mimeview->ctree));
+ gtk_tree_store_clear(GTK_TREE_STORE(model));
+
textview_clear(mimeview->textview);
if (mimeview->mimeviewer != NULL)
mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
mimeview->mimeinfo = NULL;
+ gtk_tree_path_free(mimeview->opened);
mimeview->opened = NULL;
g_free(mimeview->file);
mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
}
+gchar * get_message_check_signature_shortcut(MessageView *messageview) {
+ GtkUIManager *ui_manager;
+
+ if (messageview->window != NULL)
+ ui_manager = messageview->ui_manager;
+ else
+ ui_manager = messageview->mainwin->ui_manager;
+
+ return cm_menu_item_get_shortcut(ui_manager, "Menu/Message/CheckSignature");
+}
+
static void check_signature_cb(GtkWidget *widget, gpointer user_data);
-static void mimeview_check_signature(MimeView *mimeview);
static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo,
StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
SignatureStatus mycode = SIGNATURE_UNCHECKED;
- g_return_if_fail(mimeview != NULL);
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeview != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
if (special)
mycode = code;
icon = STOCK_PIXMAP_PRIVACY_FAILED;
break;
case SIGNATURE_CHECK_FAILED:
- button_text = _("Check again");
- func = check_signature_cb;
- icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
case SIGNATURE_CHECK_TIMEOUT:
button_text = _("Check again");
func = check_signature_cb;
icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
+ break;
default:
break;
}
if (mycode == SIGNATURE_UNCHECKED) {
gchar *tmp = privacy_mimeinfo_sig_info_short(mimeinfo);
- text = g_strdup_printf("%s %s",
- tmp, _("Click the icon or hit 'C' to check it."));
+ gchar *shortcut = get_message_check_signature_shortcut(mimeview->messageview);
+
+ if (*shortcut == '\0')
+ text = g_strdup_printf(_("%s Click the icon to check it."), tmp);
+ else
+ text = g_strdup_printf(_("%s Click the icon or hit '%s' to check it."),
+ tmp, shortcut);
g_free(tmp);
+ g_free(shortcut);
} else if (mycode != SIGNATURE_CHECK_TIMEOUT) {
text = privacy_mimeinfo_sig_info_short(mimeinfo);
} else if (mycode == SIGNATURE_CHECK_TIMEOUT) {
- text = g_strdup(_("Timeout checking the signature. Click the icon or hit 'C' to try again."));
+ gchar *shortcut = get_message_check_signature_shortcut(mimeview->messageview);
+
+ if (*shortcut == '\0')
+ text = g_strdup(_("Timeout checking the signature. Click the icon to try again."));
+ else
+ text = g_strdup_printf(_("Timeout checking the signature. Click the icon or hit '%s' to try again."), shortcut);
+ g_free(shortcut);
}
noticeview_set_text(mimeview->siginfoview, text);
(gpointer) mimeview);
noticeview_set_icon(mimeview->siginfoview, icon);
noticeview_set_tooltip(mimeview->siginfoview, button_text);
+
+ icon_list_clear(mimeview);
+ icon_list_create(mimeview, mimeview->mimeinfo);
}
#ifdef USE_PTHREAD
/* reset all thread stuff, and do the cleanups we've been left to do */
static void mimeview_check_data_reset(MimeView *mimeview)
{
+ gboolean must_free;
+ gboolean must_destroy;
+
if (!mimeview->check_data)
return;
- if (mimeview->check_data->free_after_use) {
+ must_free = mimeview->check_data->free_after_use;
+ must_destroy = mimeview->check_data->destroy_mimeview;
+
+ if (mimeview->check_data->cancel_th_init) {
+ debug_print("killing canceller thread\n");
+ mimeview->check_data->cancel_th_init = FALSE;
+ pthread_cancel(mimeview->check_data->cancel_th);
+ }
+
+ if (must_free) {
debug_print("freeing deferred mimeinfo\n");
procmime_mimeinfo_free_all(mimeview->check_data->siginfo);
}
- if (mimeview->check_data->destroy_mimeview) {
+
+ g_free(mimeview->check_data);
+ mimeview->check_data = NULL;
+
+ if (must_destroy) {
debug_print("freeing deferred mimeview\n");
+ mimeview_free_mimeinfo(mimeview);
+ gtk_tree_path_free(mimeview->opened);
g_free(mimeview->file);
g_free(mimeview);
mimeviews = g_slist_remove(mimeviews, mimeview);
}
-
- g_free(mimeview->check_data);
- mimeview->check_data = NULL;
}
/* GUI update once the checker thread is done or killed */
if (mimeinfo == NULL) {
/* message changed !? */
- g_warning("no more siginfo!\n");
+ g_warning("no more siginfo!");
goto end;
}
if (!mimeview->check_data) {
- g_warning("nothing to check\n");
+ g_warning("nothing to check");
return FALSE;
}
if (mimeview->check_data->siginfo != mimeinfo) {
/* message changed !? */
- g_warning("different siginfo!\n");
+ g_warning("different siginfo!");
goto end;
}
else
update_signature_noticeview(mimeview, mimeview->siginfo,
FALSE, 0);
- icon_list_clear(mimeview);
- icon_list_create(mimeview, mimeview->mimeinfo);
-
+
end:
mimeview_check_data_reset(mimeview);
return FALSE;
if (!mimeview->check_data)
return NULL;
- if (mimeinfo && mimeinfo == mimeview->check_data->siginfo)
+ if (mimeinfo && mimeinfo == mimeview->check_data->siginfo) {
privacy_mimeinfo_check_signature(mimeinfo);
- else {
+ if (mimeview->check_data && mimeview->check_data->cancel_th_init) {
+ mimeview->check_data->cancel_th_init = FALSE;
+ pthread_cancel(mimeview->check_data->cancel_th);
+ }
+ } else {
/* that's strange! we changed message without
* getting killed. */
- g_warning("different siginfo!\n");
+ g_warning("different siginfo!");
mimeview_check_data_reset(mimeview);
return NULL;
}
/* wait for a few seconds... */
debug_print("waiting a while\n");
- sleep(5);
+ g_usleep(5 * 1000 * 1000);
if (!mimeview->check_data)
return NULL; /* nothing to kill, it's done in time :) */
/* too late, go away checker thread */
debug_print("killing checker thread\n");
- pthread_cancel(mimeview->check_data->th);
-
+ if (mimeview->check_data->th_init) {
+ mimeview->check_data->th_init = FALSE;
+ pthread_cancel(mimeview->check_data->th);
+ }
+
/* tell upstream it was a timeout */
mimeview->check_data->timeout = TRUE;
/* use g_timeout so that GUI updates is done from the
if (!mimeview->check_data)
return;
debug_print("killing checker thread NOW\n");
- pthread_cancel(mimeview->check_data->th);
+ if (mimeview->check_data->th_init) {
+ mimeview->check_data->th_init = FALSE;
+ pthread_cancel(mimeview->check_data->th);
+ }
/* tell upstream it was a timeout */
mimeview->check_data->timeout = TRUE;
g_free(mimeview->check_data);
mimeview->check_data = NULL;
return;
- } else
+ } else {
mimeview->check_data->th = th;
+ mimeview->check_data->th_init = TRUE;
+ }
/* create the killer thread */
pthread_create(&th2, &detach2,
mimeview_check_sig_cancel_thread,
mimeview);
+
+ mimeview->check_data->cancel_th = th2;
+ mimeview->check_data->cancel_th_init = TRUE;
}
#endif
debug_print("checking without thread\n");
privacy_mimeinfo_check_signature(mimeinfo);
update_signature_noticeview(mimeview, mimeview->siginfo, FALSE, 0);
- icon_list_clear(mimeview);
- icon_list_create(mimeview, mimeview->mimeinfo);
}
}
-static void mimeview_check_signature(MimeView *mimeview)
+void mimeview_check_signature(MimeView *mimeview)
{
check_signature_cb(NULL, mimeview);
}
static void redisplay_email(GtkWidget *widget, gpointer user_data)
{
MimeView *mimeview = (MimeView *) user_data;
- GtkCMCTreeNode *node = mimeview->opened;
+ gtk_tree_path_free(mimeview->opened);
mimeview->opened = NULL;
- mimeview_selected(GTK_CMCTREE(mimeview->ctree), node, 0, mimeview);
+ mimeview_selected(gtk_tree_view_get_selection(
+ GTK_TREE_VIEW(mimeview->ctree)), mimeview);
}
static void display_full_info_cb(GtkWidget *widget, gpointer user_data)
MimeInfo *siginfo;
MimeInfo *first_text;
- g_return_if_fail(mimeview != NULL);
- g_return_if_fail(selected != NULL);
+ cm_return_if_fail(mimeview != NULL);
+ cm_return_if_fail(selected != NULL);
if (selected->type == MIMETYPE_MESSAGE
&& !g_ascii_strcasecmp(selected->subtype, "rfc822")) {
siginfo = procmime_mimeinfo_parent(siginfo);
}
mimeview->siginfo = siginfo;
-
+
+ /* This shortcut boolean is there to correctly set the menu's
+ * CheckSignature item sensitivity without killing performance
+ * each time the menu sensitiveness is updated (a lot).
+ */
+ mimeview->signed_part = (siginfo != NULL);
+
if (siginfo == NULL) {
noticeview_hide(mimeview->siginfoview);
return;
noticeview_show(mimeview->siginfoview);
}
-static void mimeview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *node, gint column,
- MimeView *mimeview)
+static void mimeview_selected(GtkTreeSelection *selection, MimeView *mimeview)
{
+ GtkTreeView *ctree = GTK_TREE_VIEW(mimeview->ctree);
+ GtkTreeModel *model;
+ GtkTreeIter iter;
+ GtkTreePath *path;
MimeInfo *partinfo;
- if (mimeview->opened == node) return;
- mimeview->opened = node;
+
+ selection = gtk_tree_view_get_selection(ctree);
+ if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+ return;
+
+ path = gtk_tree_model_get_path(model, &iter);
+
+ if (mimeview->opened && !gtk_tree_path_compare(mimeview->opened, path)) {
+ gtk_tree_path_free(path);
+ return;
+ }
+
+ gtk_tree_path_free(mimeview->opened);
+ mimeview->opened = path;
mimeview->spec_part = NULL;
- gtk_cmctree_node_moveto(ctree, node, -1, 0.5, 0);
+ gtk_tree_view_scroll_to_cell(ctree, path, NULL, TRUE, 0.5, 0);
- partinfo = gtk_cmctree_node_get_row_data(ctree, node);
+ partinfo = mimeview_get_node_part(mimeview, path);
if (!partinfo) return;
/* ungrab the mouse event */
- if (GTK_WIDGET_HAS_GRAB(ctree)) {
+ if (gtk_widget_has_grab(GTK_WIDGET(ctree))) {
gtk_grab_remove(GTK_WIDGET(ctree));
if (gdk_pointer_is_grabbed())
gdk_pointer_ungrab(GDK_CURRENT_TIME);
break;
}
}
-}
-static void mimeview_start_drag(GtkWidget *widget, gint button,
- GdkEvent *event, MimeView *mimeview)
-{
- GdkDragContext *context;
- MimeInfo *partinfo;
-
- g_return_if_fail(mimeview != NULL);
-
- partinfo = mimeview_get_selected_part(mimeview);
- if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
-
- context = gtk_drag_begin(widget, mimeview->target_list,
- GDK_ACTION_COPY, button, event);
- gtk_drag_set_icon_default(context);
+ if (mimeview->siginfo && privacy_auto_check_signatures(mimeview->siginfo)
+ && privacy_mimeinfo_get_sig_status(mimeview->siginfo) == SIGNATURE_UNCHECKED) {
+ mimeview_check_signature(mimeview);
+ }
}
static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
MimeView *mimeview)
{
- GtkCMCList *clist = GTK_CMCLIST(widget);
- gint row, column;
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
if (!event) return FALSE;
if (event->button == 2 || event->button == 3) {
- if (!gtk_cmclist_get_selection_info(clist, event->x, event->y,
- &row, &column))
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
+ if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
return FALSE;
- gtk_cmclist_unselect_all(clist);
- gtk_cmclist_select_row(clist, row, column);
- gtkut_clist_set_focus_row(clist, row);
+
+ gtk_tree_selection_select_iter(selection, &iter);
}
part_button_pressed(mimeview, event, mimeview_get_selected_part(mimeview));
}
-void mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
+gboolean mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
{
- mimeview_key_pressed(mimeview->ctree, event, mimeview);
+ return mimeview_key_pressed(mimeview->ctree, event, mimeview);
}
-static void mimeview_select_next_part(MimeView *mimeview)
+void mimeview_select_next_part(MimeView *mimeview)
{
- GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
- GtkCMCTreeNode *node = mimeview->opened;
+ GtkTreeView *ctree = GTK_TREE_VIEW(mimeview->ctree);
+ GtkTreeModel *model = gtk_tree_view_get_model(ctree);
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
+ GtkTreePath *path;
MimeInfo *partinfo = NULL;
+ gboolean has_next;
+ if (!mimeview->opened) return;
+
+ gtk_tree_model_get_iter(model, &iter, mimeview->opened);
+ path = gtk_tree_model_get_path(model, &iter);
skip:
- node = GTK_CMCTREE_NODE_NEXT(node);
- if (!node)
- node = gtk_cmctree_node_nth(GTK_CMCTREE(ctree), 0);
+ has_next = mimeview_tree_next(model, path);
+ if (!has_next) {
+ has_next = gtk_tree_model_get_iter_first(model, &iter);
+ gtk_tree_path_free(path);
+ path = gtk_tree_model_get_path(model, &iter);
+ }
- if (node) {
- partinfo = gtk_cmctree_node_get_row_data(ctree, node);
- if (partinfo->type == MIMETYPE_MULTIPART)
+ if (has_next) {
+ partinfo = mimeview_get_node_part(mimeview, path);
+ if (partinfo->type == MIMETYPE_MULTIPART ||
+ (!prefs_common.show_inline_attachments && partinfo->id))
goto skip;
- gtk_sctree_unselect_all(GTK_SCTREE(ctree));
- gtk_sctree_select(GTK_SCTREE(ctree), node);
+ selection = gtk_tree_view_get_selection(ctree);
+ gtk_tree_selection_select_path(selection, path);
icon_list_toggle_by_mime_info(mimeview, partinfo);
}
+
+ gtk_tree_path_free(path);
}
-static void mimeview_select_prev_part(MimeView *mimeview)
+void mimeview_select_prev_part(MimeView *mimeview)
{
- GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
- GtkCMCTreeNode *node = mimeview->opened;
+ GtkTreeView *ctree = GTK_TREE_VIEW(mimeview->ctree);
+ GtkTreeModel *model = gtk_tree_view_get_model(ctree);
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
+ GtkTreePath *path;
MimeInfo *partinfo = NULL;
+ gboolean has_prev;
+ if (!mimeview->opened) return;
+
+ gtk_tree_model_get_iter(model, &iter, mimeview->opened);
+ path = gtk_tree_model_get_path(model, &iter);
skip:
- node = GTK_CMCTREE_NODE_PREV(node);
- if (!node)
- node = gtk_cmctree_node_nth(GTK_CMCTREE(ctree), GTK_CMCLIST(ctree)->rows - 1);
+ has_prev = mimeview_tree_prev(mimeview, path);
+ if (!has_prev) {
+ while (mimeview_tree_next(model, path)) {}
+ has_prev = TRUE;
+ }
- if (node) {
- partinfo = gtk_cmctree_node_get_row_data(ctree, node);
- if (partinfo->type == MIMETYPE_MULTIPART)
+ if (has_prev) {
+ partinfo = mimeview_get_node_part(mimeview, path);
+ if (partinfo->type == MIMETYPE_MULTIPART ||
+ (!prefs_common.show_inline_attachments && partinfo->id))
goto skip;
- gtk_sctree_unselect_all(GTK_SCTREE(ctree));
- gtk_sctree_select(GTK_SCTREE(ctree), node);
+ selection = gtk_tree_view_get_selection(ctree);
+ gtk_tree_selection_select_path(selection, path);
icon_list_toggle_by_mime_info(mimeview, partinfo);
}
+
+ gtk_tree_path_free(path);
}
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
-#define KEY_PRESS_EVENT_STOP() \
- g_signal_stop_emission_by_name(G_OBJECT(ctree), \
- "key_press_event");
-
static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
MimeView *mimeview)
{
SummaryView *summaryview;
- GtkCMCTree *ctree = GTK_CMCTREE(widget);
if (!event) return FALSE;
if (!mimeview->opened) return FALSE;
return FALSE;
switch (event->keyval) {
- case GDK_space:
- if (mimeview_scroll_page(mimeview, FALSE))
+ case GDK_KEY_Home:
+ case GDK_KEY_End:
+ textview_scroll_max(mimeview->textview,
+ (event->keyval == GDK_KEY_Home));
+ return TRUE;
+ case GDK_KEY_Page_Down:
+ case GDK_KEY_space:
+ if (mimeview_scroll_page(mimeview,
+ (event->state & GDK_SHIFT_MASK) != 0))
return TRUE;
-
- mimeview_select_next_part(mimeview);
+
+ if (!(event->state & GDK_SHIFT_MASK))
+ mimeview_select_next_part(mimeview);
return TRUE;
-
- case GDK_BackSpace:
+ case GDK_KEY_Page_Up:
+ case GDK_KEY_BackSpace:
mimeview_scroll_page(mimeview, TRUE);
return TRUE;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
mimeview_scroll_one_line(mimeview,
(event->state & GDK_MOD1_MASK) != 0);
return TRUE;
- case GDK_n:
- case GDK_N:
- BREAK_ON_MODIFIER_KEY();
- mimeview_select_next_part(mimeview);
- return TRUE;
-
- case GDK_p:
- case GDK_P:
- BREAK_ON_MODIFIER_KEY();
- mimeview_select_prev_part(mimeview);
- return TRUE;
-
- case GDK_y:
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
- mimeview_save_as(mimeview);
- return TRUE;
- case GDK_t:
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
- mimeview_display_as_text(mimeview);
- return TRUE;
- case GDK_l:
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
- mimeview_launch(mimeview, NULL);
- return TRUE;
- case GDK_o:
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
-#ifndef G_OS_WIN32
- mimeview_open_with(mimeview);
-#endif
- return TRUE;
- case GDK_c:
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
- mimeview_check_signature(mimeview);
- return TRUE;
- case GDK_a:
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
- mimeview_select_next_part(mimeview);
+ case GDK_KEY_Up:
+ case GDK_KEY_Down:
+ mimeview_scroll_one_line(mimeview, (event->keyval == GDK_KEY_Up));
return TRUE;
default:
break;
}
- if (!mimeview->messageview->mainwin) return FALSE;
+ if (mimeview->messageview->new_window) return FALSE;
- summary_pass_key_press_event(summaryview, event);
- return TRUE;
+ return summary_pass_key_press_event(summaryview, event);
}
static void mimeview_drag_data_get(GtkWidget *widget,
FILE *fp;
fp = g_fopen(partinfo->data.filename, "rb");
- fseek(fp, partinfo->offset, SEEK_SET);
- headers = procheader_get_header_array_asis(fp);
- if (headers) {
- gint i;
- for (i = 0; i < headers->len; i++) {
- Header *header = g_ptr_array_index(headers, i);
- if (procheader_headername_equal(header->name, "Subject")) {
- unfold_line(header->body);
- name = g_strconcat(header->body, ".txt", NULL);
- subst_for_filename(name);
+ if (fp != NULL && fseek(fp, partinfo->offset, SEEK_SET) == 0) {
+ headers = procheader_get_header_array_asis(fp);
+ if (headers) {
+ gint i;
+ for (i = 0; i < headers->len; i++) {
+ Header *header = g_ptr_array_index(headers, i);
+ if (procheader_headername_equal(header->name, "Subject")) {
+ unfold_line(header->body);
+ name = g_strconcat(header->body, ".txt", NULL);
+ subst_for_filename(name);
+ }
}
+ procheader_header_array_destroy(headers);
}
- procheader_header_array_destroy(headers);
}
- fclose(fp);
+ if (fp != NULL)
+ fclose(fp);
if (name)
filename = g_path_get_basename(name);
g_free(name);
if ((err = procmime_get_part(filename, partinfo)) < 0)
alertpanel_error
(_("Couldn't save the part of multipart message: %s"),
- strerror(-err));
+ g_strerror(-err));
tmp = g_filename_to_uri(filename, NULL, NULL);
uriname = g_strconcat(tmp, "\r\n", NULL);
g_free(tmp);
- gtk_selection_data_set(selection_data, selection_data->target, 8,
+ gtk_selection_data_set(selection_data,
+ gtk_selection_data_get_target(selection_data), 8,
(guchar *)uriname, strlen(uriname));
g_free(uriname);
gchar *filename;
filename = g_strdup(get_part_name(partinfo));
- if (!filename || !*filename)
+ if (!filename || !*filename) {
+ g_free(filename);
filename = g_strdup_printf("noname.%d", number);
+ }
if (!g_utf8_validate(filename, -1, NULL)) {
gchar *tmp = conv_filename_to_utf8(filename);
if ((err = procmime_get_part(filename, partinfo)) < 0) {
alertpanel_error
(_("Couldn't save the part of multipart message: %s"),
- strerror(-err));
+ g_strerror(-err));
return FALSE;
}
else
startdir = g_strdup(get_home_dir());
+ manage_window_focus_in(gtk_widget_get_ancestor(mimeview->hbox, GTK_TYPE_WINDOW), NULL, NULL);
dirname = filesel_select_file_save_folder(_("Select destination folder"), startdir);
if (!dirname) {
g_free(startdir);
* Menu callback: Save the selected attachment
* \param mimeview Current display
*/
-static void mimeview_save_as(MimeView *mimeview)
+void mimeview_save_as(MimeView *mimeview)
{
gchar *filename;
gchar *filepath = NULL;
partinfo = mimeview_get_part_to_use(mimeview);
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
if (get_part_name(partinfo) == NULL) {
return;
g_free(partname);
+ manage_window_focus_in(gtk_widget_get_ancestor(mimeview->hbox, GTK_TYPE_WINDOW), NULL, NULL);
filename = filesel_select_file_save(_("Save as"), filepath);
if (!filename) {
g_free(filepath);
g_free(filepath);
}
-static void mimeview_display_as_text(MimeView *mimeview)
+void mimeview_display_as_text(MimeView *mimeview)
{
MimeInfo *partinfo;
partinfo = mimeview_get_part_to_use(mimeview);
mimeview_select_mimepart_icon(mimeview, partinfo);
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
mimeview_show_message_part(mimeview, partinfo);
}
-static void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
+void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
{
gchar *filename;
gint err;
if (!partinfo)
partinfo = mimeview_get_part_to_use(mimeview);
- g_return_if_fail(partinfo != NULL);
+ cm_return_if_fail(partinfo != NULL);
filename = procmime_get_tmp_file_name(partinfo);
if ((err = procmime_get_part(filename, partinfo)) < 0)
alertpanel_error
(_("Couldn't save the part of multipart message: %s"),
- strerror(-err));
+ g_strerror(-err));
else
mimeview_view_file(filename, partinfo, NULL, mimeview);
}
#ifndef G_OS_WIN32
-static void mimeview_open_with(MimeView *mimeview)
+void mimeview_open_with(MimeView *mimeview)
{
MimeInfo *partinfo;
mimeview_open_part_with(mimeview, partinfo, FALSE);
}
-#ifdef MAEMO
-osso_context_t *get_osso_context(void);
-#endif
static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboolean automatic)
{
gchar *filename;
gchar *mime_command = NULL;
gchar *content_type = NULL;
gint err;
-#ifdef MAEMO
- DBusConnection *dbusconn;
- gchar *uri;
- int r = 0;
-#endif
- g_return_if_fail(partinfo != NULL);
+
+ cm_return_if_fail(partinfo != NULL);
filename = procmime_get_tmp_file_name(partinfo);
if ((err = procmime_get_part(filename, partinfo)) < 0) {
alertpanel_error
(_("Couldn't save the part of multipart message: %s"),
- strerror(-err));
+ g_strerror(-err));
g_free(filename);
return;
}
partinfo->subtype);
}
-#ifdef MAEMO
- if (content_type != NULL) {
- uri = g_filename_to_uri(filename, NULL, NULL);
- dbusconn = osso_get_dbus_connection (get_osso_context());
-#ifdef CHINOOK
- r = hildon_mime_open_file_with_mime_type (dbusconn, uri, content_type);
-#else
- r = osso_mime_open_file_with_mime_type (dbusconn, uri, content_type);
-#endif
- g_free(uri);
- }
- if (r != 1) {
- alertpanel_error(_("No registered viewer for this file type."));
- }
- goto out;
-#endif
-
if ((partinfo->type == MIMETYPE_TEXT && !strcmp(partinfo->subtype, "html"))
&& prefs_common_get_uri_cmd() && prefs_common.uri_cmd[0]) {
mime_command = g_strdup(prefs_common_get_uri_cmd());
prefs_common.mime_open_cmd_history =
add_history(prefs_common.mime_open_cmd_history, cmd);
}
-#ifdef MAEMO
-out:
-#endif
+
g_free(content_type);
g_free(filename);
}
#endif
+static void mimeview_send_to(MimeView *mimeview, MimeInfo *partinfo)
+{
+ GList *attach_file = NULL;
+ AttachInfo *ainfo = NULL;
+ gchar *filename;
+ gint err;
+
+ if (!mimeview->opened) return;
+ if (!mimeview->file) return;
+
+ cm_return_if_fail(partinfo != NULL);
+
+ filename = procmime_get_tmp_file_name(partinfo);
+
+ if (!(err = procmime_get_part(filename, partinfo))) {
+ ainfo = g_new0(AttachInfo, 1);
+ ainfo->file = filename;
+ ainfo->name = g_strdup(get_part_name(partinfo));
+ ainfo->content_type = procmime_get_content_type_str(
+ partinfo->type, partinfo->subtype);
+ ainfo->charset = g_strdup(procmime_mimeinfo_get_parameter(
+ partinfo, "charset"));
+ attach_file = g_list_append(attach_file, ainfo);
+
+ compose_new(NULL, NULL, attach_file);
+
+ g_free(ainfo->name);
+ g_free(ainfo->content_type);
+ g_free(ainfo->charset);
+ g_free(ainfo);
+ g_list_free(attach_file);
+ } else
+ alertpanel_error
+ (_("Couldn't save the part of multipart message: %s"),
+ g_strerror(-err));
+ g_free(filename);
+}
+
static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
const gchar *cmd, MimeView *mimeview)
{
#ifndef G_OS_WIN32
gchar *p;
gchar buf[BUFFSIZE];
+
if (cmd == NULL)
mimeview_open_part_with(mimeview, partinfo, TRUE);
else {
}
#else
SHFILEINFO file_info;
- if ((SHGetFileInfo(filename, 0, &file_info, sizeof(SHFILEINFO), SHGFI_EXETYPE)) != 0) {
+ GError *error = NULL;
+ gunichar2 *fn16 = g_utf8_to_utf16(filename, -1, NULL, NULL, &error);
+
+ if (error != NULL) {
+ alertpanel_error(_("Could not convert attachment name to UTF-16:\n\n%s"),
+ error->message);
+ debug_print("filename '%s' conversion to UTF-16 failed\n", filename);
+ g_error_free(error);
+ return;
+ }
+
+ if ((SHGetFileInfo((LPCWSTR)fn16, 0, &file_info, sizeof(SHFILEINFO), SHGFI_EXETYPE)) != 0) {
AlertValue val = alertpanel_full(_("Execute untrusted binary?"),
_("This attachment is an executable file. Executing "
"untrusted binaries is dangerous and could probably "
NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT);
if (val == G_ALERTALTERNATE) {
debug_print("executing binary\n");
- ShellExecute(NULL, "open", filename, NULL, NULL, SW_SHOW);
+ ShellExecute(NULL, L"open", (LPCWSTR)fn16, NULL, NULL, SW_SHOW);
}
- } else
- ShellExecute(NULL, "open", filename, NULL, NULL, SW_SHOW);
+ } else {
+ ShellExecute(NULL, L"open", (LPCWSTR)fn16, NULL, NULL, SW_SHOW);
+ }
+
+ g_free(fn16);
#endif
}
if (event->button == 1) {
icon_selected(mimeview, num, partinfo);
gtk_widget_grab_focus(button);
+ icon_list_toggle_by_mime_info(mimeview, partinfo);
}
part_button_pressed(mimeview, event, partinfo);
- icon_list_toggle_by_mime_info(mimeview, partinfo);
return FALSE;
}
static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
{
- GtkCMCTreeNode *node;
- node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(mimeview->ctree), NULL, partinfo);
-
- if (node)
- gtk_cmctree_select(GTK_CMCTREE(mimeview->ctree), node);
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(mimeview->ctree));
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ MimeInfo *curr = NULL;
+
+ gtk_tree_model_get_iter_first(model, &iter);
+ path = gtk_tree_model_get_path(model, &iter);
+
+ do {
+ gtk_tree_model_get_iter(model, &iter, path);
+ gtk_tree_model_get(model, &iter, COL_DATA, &curr, -1);
+ if (curr == partinfo) {
+ GtkTreeSelection *sel = gtk_tree_view_get_selection(
+ GTK_TREE_VIEW(mimeview->ctree));
+ gtk_tree_selection_select_iter(sel, &iter);
+ gtk_tree_path_free(path);
+ return;
+ }
+ } while (mimeview_tree_next(model, path));
+
+ gtk_tree_path_free(path);
}
void mimeview_select_mimepart_icon(MimeView *mimeview, MimeInfo *partinfo)
static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
MimeView *mimeview)
{
- gint num;
- MimeInfo *partinfo;
SummaryView *summaryview;
- TextView *textview;
-
- num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "icon_number"));
- partinfo = g_object_get_data(G_OBJECT(button), "partinfo");
if (!event) return FALSE;
- textview = mimeview->textview;
-
switch (event->keyval) {
- case GDK_space:
+ case GDK_KEY_space:
if (mimeview_scroll_page(mimeview, FALSE))
return TRUE;
return TRUE;
break;
- case GDK_BackSpace:
+ case GDK_KEY_BackSpace:
mimeview_scroll_page(mimeview, TRUE);
return TRUE;
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
mimeview_scroll_one_line(mimeview,
(event->state & GDK_MOD1_MASK) != 0);
return TRUE;
-
- case GDK_n:
- case GDK_N:
- BREAK_ON_MODIFIER_KEY();
- mimeview_select_next_part(mimeview);
- return TRUE;
-
- case GDK_p:
- case GDK_P:
- BREAK_ON_MODIFIER_KEY();
- mimeview_select_prev_part(mimeview);
- break;
-
- case GDK_y:
+ case GDK_KEY_y:
BREAK_ON_MODIFIER_KEY();
mimeview_save_as(mimeview);
return TRUE;
- case GDK_t:
+ case GDK_KEY_t:
BREAK_ON_MODIFIER_KEY();
mimeview_display_as_text(mimeview);
return TRUE;
- case GDK_l:
+ case GDK_KEY_l:
BREAK_ON_MODIFIER_KEY();
mimeview_launch(mimeview, NULL);
return TRUE;
#ifndef G_OS_WIN32
- case GDK_o:
+ case GDK_KEY_o:
BREAK_ON_MODIFIER_KEY();
mimeview_open_with(mimeview);
return TRUE;
#endif
- case GDK_c:
+ case GDK_KEY_c:
BREAK_ON_MODIFIER_KEY();
mimeview_check_signature(mimeview);
return TRUE;
- case GDK_a:
+ case GDK_KEY_a:
BREAK_ON_MODIFIER_KEY();
mimeview_select_next_part(mimeview);
return TRUE;
#ifdef GENERIC_UMPC
GtkRequisition r;
#endif
-#if !(GTK_CHECK_VERSION(2,12,0))
- GtkTooltips *tips = mimeview->tooltips;
-#endif
+ if (!prefs_common.show_inline_attachments && mimeinfo->id)
+ return;
+
vbox = mimeview->icon_vbox;
mimeview->icon_count++;
button = gtk_event_box_new();
- g_signal_connect(G_OBJECT(button), "visibility-notify-event",
- G_CALLBACK(mimeview_visi_notify), mimeview);
g_signal_connect(G_OBJECT(button), "motion-notify-event",
G_CALLBACK(mimeview_visi_notify), mimeview);
g_signal_connect(G_OBJECT(button), "leave-notify-event",
stockp = STOCK_PIXMAP_MIME_MESSAGE;
break;
case MIMETYPE_APPLICATION:
- if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature"))
+ if (mimeinfo->subtype && (!g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature")
+ || !g_ascii_strcasecmp(mimeinfo->subtype, "x-pkcs7-signature")
+ || !g_ascii_strcasecmp(mimeinfo->subtype, "pkcs7-signature")))
stockp = STOCK_PIXMAP_MIME_PGP_SIG;
else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pdf"))
stockp = STOCK_PIXMAP_MIME_PDF;
content_type = procmime_get_content_type_str(mimeinfo->type,
mimeinfo->subtype);
- tip = g_strjoin("\n", content_type,
- to_human_readable((goffset)mimeinfo->length), NULL);
+ tip = g_strconcat("<b>", _("Type:"), " </b>", content_type,
+ "\n<b>", _("Size:"), " </b>",
+ to_human_readable((goffset)mimeinfo->length), NULL);
g_free(content_type);
if (desc && *desc) {
- gchar *tmp = NULL;
+ gchar *tmp = NULL, *escaped = NULL;
if (!g_utf8_validate(desc, -1, NULL)) {
tmp = conv_filename_to_utf8(desc);
} else {
tmp = g_strdup(desc);
}
- tiptmp = g_strjoin("\n", tmp, tip, NULL);
+ escaped = g_markup_escape_text(tmp,-1);
+
+ tiptmp = g_strconcat(tip, "\n<b>",
+ prefs_common.attach_desc && mimeinfo->description ?
+ _("Description:") : _("Filename:"),
+ " </b>", escaped, NULL);
g_free(tip);
tip = tiptmp;
g_free(tmp);
+ g_free(escaped);
}
if (sigshort && *sigshort) {
- tiptmp = g_strjoin("\n", tip, sigshort, NULL);
+ tiptmp = g_strjoin("\n", tip, g_markup_escape_text(sigshort, -1), NULL);
g_free(tip);
tip = tiptmp;
}
g_free(sigshort);
- CLAWS_SET_TIP(button, tip);
+ gtk_widget_set_tooltip_markup(button, tip);
g_free(tip);
gtk_widget_show_all(button);
gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK,
mimeview_mime_types, 1, GDK_ACTION_COPY);
-#ifndef MAEMO
+
g_signal_connect(G_OBJECT(button), "popup-menu",
G_CALLBACK(icon_popup_menu), mimeview);
-#else
- gtk_widget_tap_and_hold_setup(GTK_WIDGET(button), NULL, NULL,
- GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
- g_signal_connect(G_OBJECT(button), "tap-and-hold",
- G_CALLBACK(icon_popup_menu), mimeview);
-#endif
g_signal_connect(G_OBJECT(button), "button_release_event",
G_CALLBACK(icon_clicked_cb), mimeview);
g_signal_connect(G_OBJECT(button), "key_press_event",
g_list_free(orig);
mimeview->icon_count = 0;
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
- gtk_adjustment_set_value(adj, adj->lower);
+ gtk_adjustment_set_value(adj, gtk_adjustment_get_lower(adj));
gtk_adjustment_changed(adj);
}
static void icon_scroll_size_allocate_cb(GtkWidget *widget,
GtkAllocation *size, MimeView *mimeview)
{
- GtkAllocation *mainbox_size;
- GtkAllocation *vbox_size;
- GtkAllocation *layout_size;
+ GtkAllocation vbox_size;
+ GtkAllocation layout_size;
GtkAdjustment *adj;
+ guint width;
+ guint height;
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
- mainbox_size = &mimeview->icon_mainbox->allocation;
- vbox_size = &mimeview->icon_vbox->allocation;
- layout_size = &mimeview->icon_scroll->allocation;
+ gtk_widget_get_allocation(mimeview->icon_vbox, &vbox_size);
+ gtk_widget_get_allocation(mimeview->icon_scroll, &layout_size);
+ gtk_layout_get_size(GTK_LAYOUT(mimeview->icon_scroll), &width, &height);
gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll),
- GTK_LAYOUT(mimeview->icon_scroll)->width,
- MAX(vbox_size->height, layout_size->height));
- adj->step_increment = 10;
+ width,
+ MAX(vbox_size.height, layout_size.height));
+ gtk_adjustment_set_step_increment(adj, 10);
}
static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
{
GtkRequisition size;
+ GtkRequisition requisition;
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
while (mimeinfo != NULL) {
if (mimeinfo->type != MIMETYPE_MULTIPART)
: NULL;
}
gtk_widget_size_request(mimeview->icon_vbox, &size);
- if (size.width > mimeview->icon_mainbox->requisition.width) {
+ gtk_widget_get_requisition(mimeview->icon_mainbox, &requisition);
+ if (size.width > requisition.width) {
gtk_widget_set_size_request(mimeview->icon_mainbox,
size.width, -1);
}
+ if (mimeview->opened)
+ icon_list_toggle_by_mime_info(mimeview,
+ mimeview_get_node_part(mimeview, mimeview->opened));
}
static void icon_list_toggle_by_mime_info (MimeView *mimeview,
MimeInfo *mimeinfo)
{
- GList *child;
+ GList *children, *child;
- child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
- for (; child != NULL; child = g_list_next(child)) {
+ children = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
+ for (child = children; child != NULL; child = g_list_next(child)) {
+ gboolean *highlight = NULL;
+ GtkWidget *icon = gtk_bin_get_child(GTK_BIN(child->data));
+
if (!GTK_IS_EVENT_BOX(child->data))
continue;
- if(g_object_get_data(G_OBJECT(child->data),
- "partinfo") == (gpointer)mimeinfo) {
- gboolean *highlight = NULL;
- GtkWidget *icon = gtk_bin_get_child(GTK_BIN(child->data));
- highlight = g_object_get_data(G_OBJECT(icon), "highlight");
- *highlight = TRUE;
- gtk_widget_queue_draw(icon);
- } else {
- gint *highlight = NULL;
- GtkWidget *icon = gtk_bin_get_child(GTK_BIN(child->data));
- highlight = g_object_get_data(G_OBJECT(icon), "highlight");
- *highlight = FALSE;
- gtk_widget_queue_draw(icon);
- }
+
+ highlight = g_object_get_data(G_OBJECT(icon), "highlight");
+ *highlight = (g_object_get_data(G_OBJECT(child->data),
+ "partinfo") == (gpointer)mimeinfo);
+
+ gtk_widget_queue_draw(icon);
}
+ g_list_free(children);
+}
+
+static void ctree_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation,
+ MimeView *mimeview)
+{
+ prefs_common.mimeview_tree_height = allocation->height;
}
static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
GTK_SHADOW_NONE);
gtk_widget_hide(mimeview->icon_mainbox);
gtk_widget_show(mimeview->ctree_mainbox);
- gtk_paned_set_position(GTK_PANED(mimeview->paned), mimeview->oldsize);
+ gtk_paned_set_position(GTK_PANED(mimeview->paned),
+ prefs_common.mimeview_tree_height);
gtkut_container_remove(GTK_CONTAINER(mimeview->icon_mainbox),
button);
} else {
gtk_arrow_set(GTK_ARROW(gtk_bin_get_child(GTK_BIN((button)))), GTK_ARROW_LEFT,
GTK_SHADOW_NONE);
- mimeview->oldsize = mimeview->ctree_mainbox->allocation.height;
gtk_widget_hide(mimeview->ctree_mainbox);
gtk_widget_show(mimeview->icon_mainbox);
gtk_paned_set_position(GTK_PANED(mimeview->paned), 0);
button);
gtk_box_pack_start(GTK_BOX(mimeview->icon_mainbox),
button, FALSE, FALSE, 0);
- gtk_box_reorder_child(GTK_BOX(button->parent), button, 0);
+ gtk_box_reorder_child(GTK_BOX(gtk_widget_get_parent(button)), button, 0);
if (mimeview->opened)
- icon_list_toggle_by_mime_info
- (mimeview, gtk_cmctree_node_get_row_data(GTK_CMCTREE(mimeview->ctree),
- mimeview->opened));
-
+ icon_list_toggle_by_mime_info(mimeview,
+ mimeview_get_node_part(mimeview, mimeview->opened));
+ summary_grab_focus(mimeview->mainwin->summaryview);
}
g_object_unref(button);
return TRUE;
}
-void mimeview_update (MimeView *mimeview) {
+void mimeview_update (MimeView *mimeview)
+{
if (mimeview && mimeview->mimeinfo) {
icon_list_clear(mimeview);
icon_list_create(mimeview, mimeview->mimeinfo);
GTK_TOGGLE_BUTTON(mimeview->messageview->mainwin->summaryview->toggle_search),
TRUE);
quicksearch_set(mimeview->messageview->mainwin->summaryview->quicksearch,
- QUICK_SEARCH_EXTENDED, buf);
+ ADVANCED_SEARCH_EXTENDED, buf);
g_free(buf);
}
}
projects / claws.git / blobdiff