/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2008 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2011 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
#define N_MIMEVIEW_COLS 3
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void mimeview_set_multipart_tree (MimeView *mimeview,
MimeInfo *mimeinfo,
GtkCMCTreeNode *parent);
static GtkCMCTreeNode *mimeview_append_part (MimeView *mimeview,
MimeInfo *partinfo,
GtkCMCTreeNode *parent);
+#endif
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);
+#if !GTK_CHECK_VERSION(3, 0, 0)
static void mimeview_selected (GtkCMCTree *ctree,
GtkCMCTreeNode *node,
gint column,
MimeView *mimeview);
+#endif
static void mimeview_start_drag (GtkWidget *widget,
gint button,
GdkEvent *event,
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_view_file (const gchar *filename,
mimeview_launch(mimeview, mimeview_get_part_to_use(mimeview));
}
+#ifndef G_OS_WIN32
static void mimeview_open_with_cb(GtkAction *action, gpointer data)
{
mimeview_open_with((MimeView *)data);
}
+#endif
static void mimeview_display_as_text_cb(GtkAction *action, gpointer 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) },
-#ifndef MAEMO
+#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) },
#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/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 (a)"), NULL, "Next part", G_CALLBACK(mimeview_select_next_part_cb) },
+ { "MimeView/PrevPart", NULL, N_("Previous part (z)"), 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 *arrow;
GtkWidget *scrollbutton;
GtkWidget *hbox;
- GtkUIManager *gui_manager = gtkut_ui_manager();
- GtkActionGroup *actions;
NoticeView *siginfoview;
+ GtkRequisition r;
+
gchar *titles[N_MIMEVIEW_COLS];
gint i;
- CLAWS_TIP_DECL();
if (!hand_cursor)
hand_cursor = gdk_cursor_new(GDK_HAND2);
GTK_POLICY_AUTOMATIC);
ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
- gtk_widget_show(ctree);
+
+ if (prefs_common.show_col_headers == FALSE)
+ gtk_cmclist_column_titles_hide(GTK_CMCLIST(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);
+ gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), COL_MIMETYPE, TRUE);
+ gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), COL_NAME, TRUE);
for (i = 0; i < N_MIMEVIEW_COLS; i++)
- GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
- GTK_CAN_FOCUS);
+ gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button,
+ FALSE);
+ gtk_widget_show(ctree);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
g_signal_connect(G_OBJECT(ctree), "tree_select_row",
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",
mimeview->ctree_mode = FALSE;
arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
gtk_widget_show(arrow);
+ gtk_widget_size_request(arrow, &r);
gtk_container_add(GTK_CONTAINER(mime_toggle), arrow);
g_signal_connect(G_OBJECT(mime_toggle), "button_release_event",
G_CALLBACK(mime_toggle_button_cb), mimeview);
ctree_mainbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
- actions = cm_menu_create_action_group("MimeView", mimeview_menu_actions,
+ mimeview->ui_manager = gtk_ui_manager_new();
+ mimeview->action_group = cm_menu_create_action_group_full(mimeview->ui_manager,
+ "MimeView", mimeview_menu_actions,
G_N_ELEMENTS(mimeview_menu_actions), (gpointer)mimeview);
- MENUITEM_ADDUI("/Menus/", "MimeView", "MimeView", GTK_UI_MANAGER_MENU);
- MENUITEM_ADDUI("/Menus/MimeView/", "Open", "MimeView/Open",
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, "/", "Menus", "Menus", GTK_UI_MANAGER_MENUBAR)
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/", "MimeView", "MimeView", GTK_UI_MANAGER_MENU);
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "Open", "MimeView/Open",
GTK_UI_MANAGER_MENUITEM);
-#ifndef MAEMO
- MENUITEM_ADDUI("/Menus/MimeView/", "OpenWith", "MimeView/OpenWith",
+#if (!defined MAEMO && !defined G_OS_WIN32)
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "OpenWith", "MimeView/OpenWith",
GTK_UI_MANAGER_MENUITEM);
#endif
- MENUITEM_ADDUI("/Menus/MimeView/", "DisplayAsText", "MimeView/DisplayAsText",
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "DisplayAsText", "MimeView/DisplayAsText",
+ GTK_UI_MANAGER_MENUITEM);
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "SaveAs", "MimeView/SaveAs",
GTK_UI_MANAGER_MENUITEM);
- MENUITEM_ADDUI("/Menus/MimeView/", "SaveAs", "MimeView/SaveAs",
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "SaveAll", "MimeView/SaveAll",
GTK_UI_MANAGER_MENUITEM);
- MENUITEM_ADDUI("/Menus/MimeView/", "SaveAll", "MimeView/SaveAll",
+ MENUITEM_ADDUI_MANAGER(mimeview->ui_manager,
+ "/Menus/MimeView/", "NextPart", "MimeView/NextPart",
GTK_UI_MANAGER_MENUITEM);
- MENUITEM_ADDUI("/Menus/MimeView/", "NextPart", "MimeView/NextPart",
+ 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(gui_manager, "/Menus/MimeView")) );
+ gtk_ui_manager_get_widget(mimeview->ui_manager, "/Menus/MimeView")) );
vbox = gtk_vbox_new(FALSE, 0);
gtk_widget_show(hbox);
gtk_widget_hide(ctree_mainbox);
#ifdef GENERIC_UMPC
- gtk_widget_set_size_request(mime_toggle, -1, arrow->requisition.height + 8);
+ gtk_widget_set_size_request(mime_toggle, -1, r.height + 8);
#endif
mimeview->hbox = hbox;
mimeview->paned = paned;
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;
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);
g_free(mimeview->file);
g_free(mimeview);
mimeviews = g_slist_remove(mimeviews, mimeview);
{
GtkCMCTreeNode *node;
- g_return_if_fail(mimeinfo != NULL);
+ cm_return_if_fail(mimeinfo != NULL);
while (mimeinfo != NULL) {
node = mimeview_append_part(mimeview, mimeinfo, parent);
str[COL_NAME] = (gchar *) get_part_name(partinfo);
node = gtk_sctree_insert_node(ctree, parent, NULL, str, 0,
- NULL, NULL, NULL, NULL,
+ NULL, NULL,
FALSE, TRUE);
gtk_cmctree_node_set_row_data(ctree, node, partinfo);
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;
/* 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);
+ }
+
+ g_free(mimeview->check_data);
+ mimeview->check_data = NULL;
+
+ if (must_free) {
debug_print("freeing deferred mimeinfo\n");
procmime_mimeinfo_free_all(mimeview->check_data->siginfo);
}
- if (mimeview->check_data->destroy_mimeview) {
+ if (must_destroy) {
debug_print("freeing deferred mimeview\n");
+ mimeview_free_mimeinfo(mimeview);
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 (!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");
/* 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
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")) {
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);
GdkDragContext *context;
MimeInfo *partinfo;
- g_return_if_fail(mimeview != NULL);
+ cm_return_if_fail(mimeview != NULL);
partinfo = mimeview_get_selected_part(mimeview);
- if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
+ if (partinfo == NULL ||
+ partinfo->disposition == DISPOSITIONTYPE_INLINE)
+ return;
context = gtk_drag_begin(widget, mimeview->target_list,
GDK_ACTION_COPY, button, event);
if (partinfo && (partinfo->type == MIMETYPE_MESSAGE ||
partinfo->type == MIMETYPE_IMAGE ||
partinfo->type == MIMETYPE_MULTIPART))
- cm_menu_set_sensitive("MimeView/DisplayAsText", FALSE);
+ cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/DisplayAsText", FALSE);
else
- cm_menu_set_sensitive("MimeView/DisplayAsText", TRUE);
+ cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/DisplayAsText", TRUE);
+#ifndef G_OS_WIN32
if (partinfo &&
partinfo->type == MIMETYPE_APPLICATION &&
!g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))
- cm_menu_set_sensitive("MimeView/Open", FALSE);
+ cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/Open", FALSE);
else
- cm_menu_set_sensitive("MimeView/Open", TRUE);
+#endif
+ cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/Open", TRUE);
g_object_set_data(G_OBJECT(mimeview->popupmenu),
"pop_partinfo", partinfo);
}
-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)
if (node) {
partinfo = gtk_cmctree_node_get_row_data(ctree, node);
- if (partinfo->type == MIMETYPE_MULTIPART)
+ 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);
#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_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);
+ case GDK_KEY_Up:
+ case GDK_KEY_Down:
+ mimeview_scroll_one_line(mimeview, (event->keyval == GDK_KEY_Up));
return TRUE;
-
- case GDK_p:
- case GDK_P:
+ case GDK_KEY_y:
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:
+ case GDK_KEY_t:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
mimeview_display_as_text(mimeview);
return TRUE;
- case GDK_l:
+ case GDK_KEY_l:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
mimeview_launch(mimeview, NULL);
return TRUE;
- case GDK_o:
+ case GDK_KEY_o:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
+#ifndef G_OS_WIN32
mimeview_open_with(mimeview);
+#endif
return TRUE;
- case GDK_c:
+ case GDK_KEY_c:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
mimeview_check_signature(mimeview);
return TRUE;
- case GDK_a:
+ case GDK_KEY_a:
BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
mimeview_select_next_part(mimeview);
return TRUE;
+ case GDK_KEY_z:
+ BREAK_ON_MODIFIER_KEY();
+ mimeview_select_prev_part(mimeview);
+ 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,
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);
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;
subst_for_filename(partname);
- if (prefs_common.attach_save_dir)
+ if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
filepath = g_strconcat(prefs_common.attach_save_dir,
G_DIR_SEPARATOR_S, partname, NULL);
else
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);
}
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);
g_free(filename);
}
+#ifndef G_OS_WIN32
static void mimeview_open_with(MimeView *mimeview)
{
MimeInfo *partinfo;
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 (content_type != NULL)
cmd = input_dialog_combo_remember
(_("Open with"),
- _("Enter the command line to open file:\n"
+ _("Enter the command-line to open file:\n"
"('%s' will be replaced with file name)"),
mime_command ? mime_command : prefs_common.mime_open_cmd,
prefs_common.mime_open_cmd_history, &remember);
else
cmd = input_dialog_combo
(_("Open with"),
- _("Enter the command line to open file:\n"
+ _("Enter the command-line to open file:\n"
"('%s' will be replaced with file name)"),
mime_command ? mime_command : prefs_common.mime_open_cmd,
prefs_common.mime_open_cmd_history);
g_free(content_type);
g_free(filename);
}
+#endif
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)
else
g_chmod(filename, S_IRUSR|S_IWUSR);
} else {
- g_warning("MIME viewer command line is invalid: '%s'", cmd);
+ g_warning("MIME viewer command-line is invalid: '%s'", cmd);
mimeview_open_part_with(mimeview, partinfo, FALSE);
}
if (execute_command_line(buf, TRUE) != 0) {
mimeview_open_part_with(mimeview, partinfo, FALSE);
}
}
+#else
+ SHFILEINFO file_info;
+ if ((SHGetFileInfo(filename, 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 "
+ "lead to compromission of your computer.\n\n"
+ "Do you want to run this file?"), GTK_STOCK_CANCEL,
+ _("Run binary"),
+ NULL, FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT);
+ if (val == G_ALERTALTERNATE) {
+ debug_print("executing binary\n");
+ ShellExecute(NULL, "open", filename, NULL, NULL, SW_SHOW);
+ }
+ } else
+ ShellExecute(NULL, "open", filename, NULL, NULL, SW_SHOW);
+
+#endif
}
void mimeview_register_viewer_factory(MimeViewerFactory *factory)
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;
- case GDK_o:
+#ifndef G_OS_WIN32
+ case GDK_KEY_o:
BREAK_ON_MODIFIER_KEY();
mimeview_open_with(mimeview);
return TRUE;
- case GDK_c:
+#endif
+ 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;
MimeInfo *partinfo;
MimeInfo *siginfo = NULL;
MimeInfo *encrypted = NULL;
+#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;
} else {
tmp = g_strdup(desc);
}
- tiptmp = g_strjoin("\n", tmp, tip, NULL);
+ tiptmp = g_strconcat(tip, "\n<b>",
+ prefs_common.attach_desc && mimeinfo->description ?
+ _("Description:") : _("Filename:"),
+ " </b>", tmp, NULL);
g_free(tip);
tip = tiptmp;
g_free(tmp);
}
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,
G_CALLBACK(mimeview_drag_data_get), mimeview);
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
#ifdef GENERIC_UMPC
- gtk_widget_set_size_request(vbox, -1, pixmap->requisition.height + 8);
- gtk_widget_set_size_request(button, -1, pixmap->requisition.height + 4);
+ gtk_widget_size_request(pixmap, &r);
+ gtk_widget_set_size_request(button, -1, r.height + 4);
#endif
}
static void icon_list_clear (MimeView *mimeview)
{
- GList *child;
+ GList *child, *orig;
GtkAdjustment *adj;
- child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
- for (; child != NULL; child = g_list_next(child)) {
+ orig = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
+ for (child = orig; child != NULL; child = g_list_next(child)) {
gtkut_container_remove(GTK_CONTAINER(mimeview->icon_vbox),
GTK_WIDGET(child->data));
}
- g_list_free(child);
+ 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);
}
static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
MimeView *mimeview)
{
+ GtkAllocation allocation;
g_object_ref(button);
mimeview_leave_notify(button, NULL, NULL);
} 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_get_allocation(mimeview->ctree_mainbox, &allocation);
+ mimeview->oldsize = 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_save_as(mimeview);
else if (!strcmp(cmd, "sc://display_as_text"))
mimeview_display_as_text(mimeview);
+#ifndef G_OS_WIN32
else if (!strcmp(cmd, "sc://open_with"))
mimeview_open_with(mimeview);
+#endif
else if (!strcmp(cmd, "sc://open"))
mimeview_launch(mimeview, NULL);
else if (!strcmp(cmd, "sc://select_attachment") && data != NULL) {
projects / claws.git / blobdiff