/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "utils.h"
#include "gtkutils.h"
#include "prefs_common.h"
+#include "procheader.h"
#include "stock_pixmap.h"
#include "gtk/gtkvscrollbutton.h"
-
+#include "gtk/logwindow.h"
+#include "timing.h"
typedef enum
{
guint time,
MimeView *mimeview);
+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);
+static void mimeview_launch (MimeView *mimeview,
+ MimeInfo *partinfo);
static void mimeview_open_with (MimeView *mimeview);
+static void mimeview_open_part_with (MimeView *mimeview,
+ MimeInfo *partinfo,
+ gboolean automatic);
static void mimeview_view_file (const gchar *filename,
MimeInfo *partinfo,
- const gchar *cmdline);
+ const gchar *cmd,
+ MimeView *mimeview);
static gboolean icon_clicked_cb (GtkWidget *button,
GdkEventButton *event,
MimeView *mimeview);
GtkAllocation *layout_size,
MimeView *mimeview);
+static void mimeview_launch_cb(MimeView *mimeview)
+{
+ mimeview_launch(mimeview, NULL);
+}
static GtkItemFactoryEntry mimeview_popup_entries[] =
{
- {N_("/_Open"), NULL, mimeview_launch, 0, NULL},
+ {N_("/_Open"), NULL, mimeview_launch_cb, 0, NULL},
{N_("/Open _with..."), NULL, mimeview_open_with, 0, NULL},
{N_("/_Display as text"), NULL, mimeview_display_as_text, 0, NULL},
{N_("/_Save as..."), NULL, mimeview_save_as, 0, NULL},
scrollbutton = gtk_vscrollbutton_new(gtk_layout_get_vadjustment(GTK_LAYOUT(icon_scroll)));
gtk_widget_show(scrollbutton);
+ g_signal_connect(G_OBJECT(icon_scroll), "scroll_event",
+ G_CALLBACK(mimeview_scrolled), mimeview);
+
mime_toggle = gtk_toggle_button_new();
gtk_widget_show(mime_toggle);
arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
mimeview->oldsize = 60;
mimeview->mime_toggle = mime_toggle;
mimeview->siginfoview = siginfoview;
-
+ mimeview->scrollbutton = scrollbutton;
mimeview->target_list = gtk_target_list_new(mimeview_mime_types, 1);
mimeviews = g_slist_prepend(mimeviews, mimeview);
}
}
+#ifdef USE_PTHREAD
+static void mimeview_check_sig_cancel_now(MimeView *mimeview);
+#endif
+
+static void mimeview_free_mimeinfo(MimeView *mimeview)
+{
+ gboolean defer = FALSE;
+#ifdef USE_PTHREAD
+ defer = (mimeview->check_data != NULL);
+ if (defer)
+ mimeview->check_data->free_after_use = TRUE;
+#endif
+ if (mimeview->mimeinfo != NULL && !defer) {
+ procmime_mimeinfo_free_all(mimeview->mimeinfo);
+ mimeview->mimeinfo = NULL;
+ } else if (defer) {
+#ifdef USE_PTHREAD
+ debug_print("deferring free(mimeinfo) and cancelling check\n");
+ mimeview_check_sig_cancel_now(mimeview);
+#endif
+ }
+}
+
void mimeview_destroy(MimeView *mimeview)
{
GSList *cur;
for (cur = mimeview->viewers; cur != NULL; cur = g_slist_next(cur)) {
MimeViewer *viewer = (MimeViewer *) cur->data;
- gtk_container_remove(GTK_CONTAINER(mimeview->mime_notebook),
- GTK_WIDGET(viewer->get_widget(viewer)));
viewer->destroy_viewer(viewer);
}
g_slist_free(mimeview->viewers);
gtk_target_list_unref(mimeview->target_list);
- procmime_mimeinfo_free_all(mimeview->mimeinfo);
- g_free(mimeview->file);
- g_free(mimeview);
-
- mimeviews = g_slist_remove(mimeviews, mimeview);
+ mimeview_free_mimeinfo(mimeview);
+#ifdef USE_PTHREAD
+ if (mimeview->check_data) {
+ mimeview->check_data->destroy_mimeview = TRUE;
+ debug_print("deferring destroy\n");
+ } else
+#endif
+ {
+ g_free(mimeview->file);
+ g_free(mimeview);
+ mimeviews = g_slist_remove(mimeviews, mimeview);
+ }
}
}
}
-static const gchar *get_part_name(MimeInfo *partinfo)
+static const gchar *get_real_part_name(MimeInfo *partinfo)
{
- const gchar *name;
+ const gchar *name = NULL;
name = procmime_mimeinfo_get_parameter(partinfo, "filename");
if (name == NULL)
name = procmime_mimeinfo_get_parameter(partinfo, "name");
+
+ return name;
+}
+
+static const gchar *get_part_name(MimeInfo *partinfo)
+{
+ const gchar *name;
+
+ name = get_real_part_name(partinfo);
if (name == NULL)
name = "";
else
str[COL_NAME] = (gchar *) get_part_name(partinfo);
- node = gtk_ctree_insert_node(ctree, parent, NULL, str, 0,
+ node = gtk_sctree_insert_node(ctree, parent, NULL, str, 0,
NULL, NULL, NULL, NULL,
FALSE, TRUE);
gtk_ctree_node_set_row_data(ctree, node, partinfo);
const gchar *fname;
if (!partinfo) return;
+ if (partinfo == mimeview->opened)
+ return;
fname = mimeview->file;
if (!fname) return;
mimeview->mimeviewer = viewer;
mimeview_change_view_type(mimeview, MIMEVIEW_VIEWER);
}
+ viewer->mimeview = mimeview;
viewer->show_mimepart(viewer, mimeview->file, partinfo);
return TRUE;
static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
{
TextView *textview = mimeview->textview;
+ GtkWidget *focused = NULL;
+
+ if (mainwindow_get_mainwindow())
+ focused = gtkut_get_focused_child(mainwindow_get_mainwindow()->window);
if ((mimeview->type != MIMEVIEW_VIEWER) &&
(mimeview->type == type)) return;
default:
return;
}
-
+ if (focused)
+ gtk_widget_grab_focus(focused);
mimeview->type = type;
}
void mimeview_clear(MimeView *mimeview)
{
- GtkCList *clist = GTK_CLIST(mimeview->ctree);
+ GtkCList *clist = NULL;
+
+ if (!mimeview)
+ return;
+ if (g_slist_find(mimeviews, mimeview) == NULL)
+ return;
+
+ clist = GTK_CLIST(mimeview->ctree);
+
noticeview_hide(mimeview->siginfoview);
gtk_clist_clear(clist);
if (mimeview->mimeviewer != NULL)
mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
- if (mimeview->mimeinfo != NULL)
- procmime_mimeinfo_free_all(mimeview->mimeinfo);
+ mimeview_free_mimeinfo(mimeview);
+
mimeview->mimeinfo = NULL;
mimeview->opened = NULL;
mimeview->file = NULL;
icon_list_clear(mimeview);
+ mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
}
static void check_signature_cb(GtkWidget *widget, gpointer user_data);
+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)
+static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo,
+ gboolean special, SignatureStatus code)
{
gchar *text = NULL, *button_text = NULL;
void *func = NULL;
StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
-
+ SignatureStatus mycode = SIGNATURE_UNCHECKED;
+
g_return_if_fail(mimeview != NULL);
g_return_if_fail(mimeinfo != NULL);
- switch (privacy_mimeinfo_get_sig_status(mimeinfo)) {
+ if (special)
+ mycode = code;
+ else
+ mycode = privacy_mimeinfo_get_sig_status(mimeinfo);
+
+ switch (mycode) {
case SIGNATURE_UNCHECKED:
button_text = _("Check signature");
func = check_signature_cb;
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;
default:
break;
}
- text = privacy_mimeinfo_sig_info_short(mimeinfo);
+ 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."));
+ g_free(tmp);
+ } 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."));
+ }
+
noticeview_set_text(mimeview->siginfoview, text);
+ gtk_label_set_selectable(GTK_LABEL(mimeview->siginfoview->text), TRUE);
+
g_free(text);
noticeview_set_button_text(mimeview->siginfoview, NULL);
noticeview_set_button_press_callback(
noticeview_set_tooltip(mimeview->siginfoview, button_text);
}
-static void check_signature_cb(GtkWidget *widget, gpointer user_data)
+#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)
{
- MimeView *mimeview = (MimeView *) user_data;
+ if (!mimeview->check_data)
+ return;
+
+ if (mimeview->check_data->free_after_use) {
+ debug_print("freeing deferred mimeinfo\n");
+ procmime_mimeinfo_free_all(mimeview->check_data->siginfo);
+ }
+ if (mimeview->check_data->destroy_mimeview) {
+ debug_print("freeing deferred mimeview\n");
+ 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 */
+static gboolean mimeview_check_sig_thread_cb(void *data)
+{
+ MimeView *mimeview = (MimeView *) data;
MimeInfo *mimeinfo = mimeview->siginfo;
+
+ debug_print("mimeview_check_sig_thread_cb\n");
- privacy_mimeinfo_check_signature(mimeinfo);
- update_signature_noticeview(mimeview, mimeview->siginfo);
+ if (mimeinfo == NULL) {
+ /* message changed !? */
+ g_warning("no more siginfo!\n");
+ goto end;
+ }
+
+ if (!mimeview->check_data) {
+ g_warning("nothing to check\n");
+ return FALSE;
+ }
+
+ if (mimeview->check_data->siginfo != mimeinfo) {
+ /* message changed !? */
+ g_warning("different siginfo!\n");
+ goto end;
+ }
+
+ if (mimeview->check_data->destroy_mimeview ||
+ mimeview->check_data->free_after_use) {
+ debug_print("not bothering, we're changing message\n");
+ goto end;
+ }
+
+ /* update status */
+ if (mimeview->check_data->timeout)
+ update_signature_noticeview(mimeview, mimeview->siginfo,
+ TRUE, SIGNATURE_CHECK_TIMEOUT);
+ 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;
+}
+
+/* sig checker thread */
+static void *mimeview_check_sig_worker_thread(void *data)
+{
+ MimeView *mimeview = (MimeView *)data;
+ MimeInfo *mimeinfo = mimeview->siginfo;
+
+ debug_print("checking...\n");
+
+ if (!mimeview->check_data)
+ return NULL;
+
+ if (mimeinfo && mimeinfo == mimeview->check_data->siginfo)
+ privacy_mimeinfo_check_signature(mimeinfo);
+ else {
+ /* that's strange! we changed message without
+ * getting killed. */
+ g_warning("different siginfo!\n");
+ mimeview_check_data_reset(mimeview);
+ return NULL;
+ }
+
+ /* use g_timeout so that GUI updates is done from the
+ * correct thread */
+ g_timeout_add(0,mimeview_check_sig_thread_cb,mimeview);
+
+ return NULL;
+}
+
+/* killer thread - acts when the checker didn't work fast
+ * enough. */
+static void *mimeview_check_sig_cancel_thread(void *data)
+{
+ MimeView *mimeview = (MimeView *)data;
+
+ if (!mimeview->check_data)
+ return NULL; /* nothing to kill ! */
+
+ /* wait for a few seconds... */
+ debug_print("waiting a while\n");
+
+ sleep(5);
+
+ 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);
+
+ /* tell upstream it was a timeout */
+ mimeview->check_data->timeout = TRUE;
+ /* use g_timeout so that GUI updates is done from the
+ * correct thread */
+ g_timeout_add(0,mimeview_check_sig_thread_cb,mimeview);
+
+ return NULL;
+}
+
+/* get rid of the checker thread right now - used when changing the
+ * displayed message for example. */
+static void mimeview_check_sig_cancel_now(MimeView *mimeview)
+{
+ if (!mimeview->check_data)
+ return;
+ debug_print("killing checker thread NOW\n");
+ pthread_cancel(mimeview->check_data->th);
+
+ /* tell upstream it was a timeout */
+ mimeview->check_data->timeout = TRUE;
+ mimeview_check_sig_thread_cb(mimeview);
+ return;
+}
+
+/* creates a thread to check the signature, and a second one
+ * to kill the first one after a timeout */
+static void mimeview_check_sig_in_thread(MimeView *mimeview)
+{
+ pthread_t th, th2;
+ pthread_attr_t detach, detach2;
+
+ if (mimeview->check_data) {
+ g_warning("already checking it");
+ return;
+ }
+
+ mimeview->check_data = g_new0(SigCheckData, 1);
+ mimeview->check_data->siginfo = mimeview->siginfo;
+ debug_print("creating thread\n");
+
+ pthread_attr_init(&detach);
+ pthread_attr_setdetachstate(&detach, TRUE);
+
+ pthread_attr_init(&detach2);
+ pthread_attr_setdetachstate(&detach2, TRUE);
+
+ /* create the checker thread */
+ if (pthread_create(&th, &detach,
+ mimeview_check_sig_worker_thread,
+ mimeview) != 0) {
+ /* arh. We'll do it synchronously. */
+ g_warning("can't create thread");
+ g_free(mimeview->check_data);
+ mimeview->check_data = NULL;
+ return;
+ } else
+ mimeview->check_data->th = th;
+
+ /* create the killer thread */
+ pthread_create(&th2, &detach2,
+ mimeview_check_sig_cancel_thread,
+ mimeview);
+}
+#endif
+
+static void check_signature_cb(GtkWidget *widget, gpointer user_data)
+{
+ MimeView *mimeview = (MimeView *) user_data;
+ MimeInfo *mimeinfo = mimeview->siginfo;
+
+ if (mimeinfo == NULL)
+ return;
+#ifdef USE_PTHREAD
+ if (mimeview->check_data)
+ return;
+#endif
+ noticeview_set_text(mimeview->siginfoview, _("Checking signature..."));
+ GTK_EVENTS_FLUSH();
+#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
+ /* let's do it non-blocking */
+ mimeview_check_sig_in_thread(mimeview);
+ if (!mimeview->check_data) /* let's check syncronously */
+#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);
+ }
+}
+
+void mimeview_check_signature(MimeView *mimeview)
+{
+ check_signature_cb(NULL, mimeview);
}
static void redisplay_email(GtkWidget *widget, gpointer user_data)
return;
}
- update_signature_noticeview(mimeview, siginfo);
+ update_signature_noticeview(mimeview, siginfo, FALSE, 0);
noticeview_show(mimeview->siginfoview);
}
MimeView *mimeview)
{
MimeInfo *partinfo;
-
if (mimeview->opened == node) return;
mimeview->opened = node;
+ mimeview->spec_part = NULL;
gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
partinfo = gtk_ctree_node_get_row_data(ctree, node);
break;
default:
- mimeview->textview->default_text = TRUE;
+ mimeview->textview->default_text = TRUE;
mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
+ textview_clear(mimeview->textview);
textview_show_mime_part(mimeview->textview, partinfo);
break;
}
return FALSE;
}
+static gboolean mimeview_scrolled(GtkWidget *widget, GdkEventScroll *event,
+ MimeView *mimeview)
+{
+ GtkVScrollbutton *scrollbutton = (GtkVScrollbutton *)mimeview->scrollbutton;
+ if (event->direction == GDK_SCROLL_UP) {
+ scrollbutton->scroll_type = GTK_SCROLL_STEP_BACKWARD;
+ } else {
+ scrollbutton->scroll_type = GTK_SCROLL_STEP_FORWARD;
+ }
+ gtk_vscrollbutton_scroll(scrollbutton);
+ return TRUE;
+}
+
/* from gdkevents.c */
#define DOUBLE_CLICK_TIME 250
if (event->button == 2 ||
(event->button == 1 && (event->time - lasttime) < DOUBLE_CLICK_TIME && lastinfo == partinfo)) {
/* call external program for image, audio or html */
- mimeview_launch(mimeview);
+ mimeview_launch(mimeview, partinfo);
return TRUE;
} else if (event->button == 3) {
- if (partinfo && (partinfo->type == MIMETYPE_TEXT ||
- partinfo->type == MIMETYPE_MESSAGE ||
+ if (partinfo && (partinfo->type == MIMETYPE_MESSAGE ||
partinfo->type == MIMETYPE_IMAGE ||
partinfo->type == MIMETYPE_MULTIPART))
menu_set_sensitive(mimeview->popupfactory,
switch (event->keyval) {
case GDK_space:
- if (textview_scroll_page(mimeview->textview, FALSE))
+ if (mimeview_scroll_page(mimeview, FALSE))
return TRUE;
node = GTK_CTREE_NODE_NEXT(mimeview->opened);
}
break;
case GDK_BackSpace:
- textview_scroll_page(mimeview->textview, TRUE);
+ mimeview_scroll_page(mimeview, TRUE);
return TRUE;
case GDK_Return:
- textview_scroll_one_line(mimeview->textview,
+ mimeview_scroll_one_line(mimeview,
(event->state & GDK_MOD1_MASK) != 0);
return TRUE;
case GDK_n:
case GDK_l:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
- mimeview_launch(mimeview);
+ mimeview_launch(mimeview, NULL);
return TRUE;
case GDK_o:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
mimeview_open_with(mimeview);
return TRUE;
+ case GDK_c:
+ BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
+ mimeview_check_signature(mimeview);
+ return TRUE;
default:
break;
}
guint time,
MimeView *mimeview)
{
- gchar *filename, *uriname, *tmp;
+ gchar *filename = NULL, *uriname, *tmp;
MimeInfo *partinfo;
if (!mimeview->opened) return;
partinfo = mimeview_get_selected_part(mimeview);
if (!partinfo) return;
- filename = g_path_get_basename(get_part_name(partinfo));
- if (*filename == '\0') return;
+ if (strlen(get_part_name(partinfo)) > 0) {
+ filename = g_path_get_basename(get_part_name(partinfo));
+ if (*filename == '\0') return;
+ } else if (partinfo->type == MIMETYPE_MESSAGE
+ && !g_ascii_strcasecmp(partinfo->subtype, "rfc822")) {
+ gchar *name = NULL;
+ GPtrArray *headers = NULL;
+ 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);
+ }
+ }
+ procheader_header_array_destroy(headers);
+ }
+ fclose(fp);
+ if (name)
+ filename = g_path_get_basename(name);
+ g_free(name);
+ }
+ if (filename == NULL)
+ filename = g_path_get_basename("Unnamed part");
+
- tmp = filename;
+ tmp = g_filename_from_utf8(filename, -1, NULL, NULL, NULL);
+ if (tmp == NULL) {
+ g_warning("filename not in UTF-8");
+ tmp = g_strdup("Unnamed part");
+ }
filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
- filename, NULL);
+ tmp, NULL);
g_free(tmp);
-
+
if (procmime_get_part(filename, partinfo) < 0)
alertpanel_error
(_("Can't save the part of multipart message."));
+ uriname = g_strconcat("file://", filename, "\r\n", NULL);
- uriname = g_strconcat("file://", filename, NULL);
gtk_selection_data_set(selection_data, selection_data->target, 8,
- uriname, strlen(uriname));
+ (guchar *)uriname, strlen(uriname));
g_free(uriname);
g_free(filename);
? &filename[1] : filename, NULL);
g_free(filename);
- return fullname;
+ filename = conv_filename_from_utf8(fullname);
+ g_free(fullname);
+ return filename;
}
/**
if (is_file_exist(filename)) {
AlertValue aval;
gchar *res;
+ gchar *tmp;
+
+ if (!g_utf8_validate(filename, -1, NULL))
+ tmp = conv_filename_to_utf8(filename);
+ else
+ tmp = g_strdup(filename);
res = g_strdup_printf(_("Overwrite existing file '%s'?"),
- filename);
- aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK,
- GTK_STOCK_CANCEL, NULL);
+ tmp);
+ g_free(tmp);
+ aval = alertpanel(_("Overwrite"), res, GTK_STOCK_CANCEL,
+ GTK_STOCK_OK, NULL);
g_free(res);
- if (G_ALERTDEFAULT != aval) return FALSE;
+ if (G_ALERTALTERNATE != aval) return FALSE;
}
if (procmime_get_part(filename, partinfo) < 0) {
dirname = filesel_select_file_save_folder(_("Select destination folder"), startdir);
if (!dirname) {
- if (startdir) g_free(startdir);
+ g_free(startdir);
return;
}
if (!is_dir_exist (dirname)) {
alertpanel_error(_("'%s' is not a directory."),
dirname);
- if (startdir) g_free(startdir);
+ g_free(startdir);
return;
}
while (partinfo != NULL) {
if (partinfo->type != MIMETYPE_MESSAGE &&
partinfo->type != MIMETYPE_MULTIPART &&
- partinfo->disposition != DISPOSITIONTYPE_INLINE) {
+ (partinfo->disposition != DISPOSITIONTYPE_INLINE
+ || get_real_part_name(partinfo) != NULL)) {
gchar *filename = mimeview_get_filename_for_part
(partinfo, dirname, number++);
partinfo = procmime_mimeinfo_next(partinfo);
}
- if (prefs_common.attach_save_dir)
- g_free(prefs_common.attach_save_dir);
-
+ g_free(prefs_common.attach_save_dir);
+ g_free(startdir);
prefs_common.attach_save_dir = g_strdup(dirname);
-
- if (startdir) g_free(startdir);
}
+static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview)
+{
+ MimeInfo *partinfo = NULL;
+ if (mimeview->spec_part) {
+ partinfo = mimeview->spec_part;
+ mimeview->spec_part = NULL;
+ } else {
+ partinfo = mimeview_get_selected_part(mimeview);
+ if (!partinfo) {
+ partinfo = (MimeInfo *) g_object_get_data
+ (G_OBJECT(mimeview->popupmenu),
+ "pop_partinfo");
+ g_object_set_data(G_OBJECT(mimeview->popupmenu),
+ "pop_partinfo", NULL);
+ }
+ }
+
+ return partinfo;
+}
/**
* Menu callback: Save the selected attachment
* \param mimeview Current display
if (!mimeview->opened) return;
if (!mimeview->file) return;
- partinfo = mimeview_get_selected_part(mimeview);
- if (!partinfo) {
- partinfo = (MimeInfo *) g_object_get_data
- (G_OBJECT(mimeview->popupmenu),
- "pop_partinfo");
- g_object_set_data(G_OBJECT(mimeview->popupmenu),
- "pop_partinfo", NULL);
- }
+ partinfo = mimeview_get_part_to_use(mimeview);
+
g_return_if_fail(partinfo != NULL);
if (get_part_name(partinfo) == NULL) {
filedir = g_path_get_dirname(filename);
if (filedir && strcmp(filedir, ".")) {
- if (prefs_common.attach_save_dir)
- g_free(prefs_common.attach_save_dir);
+ g_free(prefs_common.attach_save_dir);
prefs_common.attach_save_dir = g_strdup(filedir);
}
if (!mimeview->opened) return;
- partinfo = mimeview_get_selected_part(mimeview);
- if (!partinfo) {
- partinfo = (MimeInfo *) g_object_get_data
- (G_OBJECT(mimeview->popupmenu),
- "pop_partinfo");
- g_object_set_data(G_OBJECT(mimeview->popupmenu),
- "pop_partinfo", NULL);
-
- }
+ partinfo = mimeview_get_part_to_use(mimeview);
+
g_return_if_fail(partinfo != NULL);
mimeview_show_message_part(mimeview, partinfo);
}
-static void mimeview_launch(MimeView *mimeview)
+static void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
{
- MimeInfo *partinfo;
gchar *filename;
if (!mimeview->opened) return;
if (!mimeview->file) return;
- partinfo = mimeview_get_selected_part(mimeview);
- if (!partinfo) {
- partinfo = (MimeInfo *) g_object_get_data
- (G_OBJECT(mimeview->popupmenu),
- "pop_partinfo");
- g_object_set_data(G_OBJECT(mimeview->popupmenu),
- "pop_partinfo", NULL);
- }
+ if (!partinfo)
+ partinfo = mimeview_get_part_to_use(mimeview);
+
g_return_if_fail(partinfo != NULL);
filename = procmime_get_tmp_file_name(partinfo);
alertpanel_error
(_("Can't save the part of multipart message."));
else
- mimeview_view_file(filename, partinfo, NULL);
+ mimeview_view_file(filename, partinfo, NULL, mimeview);
g_free(filename);
}
static void mimeview_open_with(MimeView *mimeview)
{
MimeInfo *partinfo;
+
+ if (!mimeview) return;
+ if (!mimeview->opened) return;
+ if (!mimeview->file) return;
+
+ partinfo = mimeview_get_part_to_use(mimeview);
+
+ mimeview_open_part_with(mimeview, partinfo, FALSE);
+}
+
+static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboolean automatic)
+{
gchar *filename;
gchar *cmd;
gchar *mime_command = NULL;
gchar *content_type = NULL;
- if (!mimeview->opened) return;
- if (!mimeview->file) return;
-
- partinfo = mimeview_get_selected_part(mimeview);
- if (!partinfo) {
- partinfo = (MimeInfo *) g_object_get_data
- (G_OBJECT(mimeview->popupmenu),
- "pop_partinfo");
- g_object_set_data(G_OBJECT(mimeview->popupmenu),
- "pop_partinfo", NULL);
- }
g_return_if_fail(partinfo != NULL);
filename = procmime_get_tmp_file_name(partinfo);
prefs_common.mime_open_cmd_history =
add_history(NULL, prefs_common.mime_open_cmd);
- content_type = procmime_get_content_type_str(partinfo->type,
+ if ((partinfo->type == MIMETYPE_APPLICATION) &&
+ (!g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))) {
+ /* guess content-type from filename */
+ content_type = procmime_get_mime_type(filename);
+ }
+ if (content_type == NULL) {
+ content_type = procmime_get_content_type_str(partinfo->type,
partinfo->subtype);
- mime_command = mailcap_get_command_for_type(content_type);
- g_free(content_type);
- cmd = input_dialog_combo
- (_("Open with"),
- _("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,
- TRUE);
- g_free(mime_command);
+ }
+
+ if ((partinfo->type == MIMETYPE_TEXT && !strcmp(partinfo->subtype, "html"))
+ && prefs_common.uri_cmd && prefs_common.uri_cmd[0]) {
+ mime_command = g_strdup(prefs_common.uri_cmd);
+ g_free(content_type);
+ content_type = NULL;
+ } else if (partinfo->type != MIMETYPE_TEXT || !prefs_common.ext_editor_cmd
+ || !prefs_common.ext_editor_cmd[0]) {
+ mime_command = mailcap_get_command_for_type(content_type, filename);
+ } else {
+ mime_command = g_strdup(prefs_common.ext_editor_cmd);
+ g_free(content_type);
+ content_type = NULL;
+ }
+ if (mime_command == NULL) {
+ /* try with extension this time */
+ g_free(content_type);
+ content_type = procmime_get_mime_type(filename);
+ mime_command = mailcap_get_command_for_type(content_type, filename);
+ }
+
+ if (mime_command == NULL)
+ automatic = FALSE;
+
+ if (!automatic) {
+ gboolean remember = FALSE;
+ if (content_type != NULL)
+ cmd = input_dialog_combo_remember
+ (_("Open with"),
+ _("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,
+ TRUE, &remember);
+ else
+ cmd = input_dialog_combo
+ (_("Open with"),
+ _("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,
+ TRUE);
+ if (cmd && remember) {
+ mailcap_update_default(content_type, cmd);
+ }
+ g_free(mime_command);
+ } else {
+ cmd = mime_command;
+ }
if (cmd) {
- mimeview_view_file(filename, partinfo, cmd);
+ mimeview_view_file(filename, partinfo, cmd, mimeview);
g_free(prefs_common.mime_open_cmd);
prefs_common.mime_open_cmd = cmd;
prefs_common.mime_open_cmd_history =
add_history(prefs_common.mime_open_cmd_history, cmd);
}
-
+ g_free(content_type);
g_free(filename);
}
static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
- const gchar *cmdline)
-{
- static gchar *default_image_cmdline = DEFAULT_IMAGE_VIEWER_CMD;
- static gchar *default_audio_cmdline = DEFAULT_AUDIO_PLAYER_CMD;
- static gchar *default_html_cmdline = DEFAULT_BROWSER_CMD;
- static gchar *mime_cmdline = DEFAULT_MIME_CMD;
- gchar buf[1024];
- gchar m_buf[1024];
- const gchar *cmd;
- const gchar *def_cmd;
- const gchar *p;
-
- if (cmdline) {
- cmd = cmdline;
- def_cmd = NULL;
- } else if (MIMETYPE_APPLICATION == partinfo->type &&
- !g_ascii_strcasecmp(partinfo->subtype, "octet-stream")) {
- return;
- } else if (MIMETYPE_IMAGE == partinfo->type) {
- cmd = prefs_common.mime_image_viewer;
- def_cmd = default_image_cmdline;
- } else if (MIMETYPE_AUDIO == partinfo->type) {
- cmd = prefs_common.mime_audio_player;
- def_cmd = default_audio_cmdline;
- } else if (MIMETYPE_TEXT == partinfo->type && !strcmp(partinfo->subtype, "html")) {
- cmd = prefs_common.uri_cmd;
- def_cmd = default_html_cmdline;
- } else {
- gchar *content_type;
-
- content_type = procmime_get_content_type_str(partinfo->type, partinfo->subtype);
- g_snprintf(m_buf, sizeof(m_buf), mime_cmdline,
- content_type, "%s");
- g_free(content_type);
- cmd = m_buf;
- def_cmd = NULL;
- }
-
- if (cmd && (p = strchr(cmd, '%')) && *(p + 1) == 's' &&
- !strchr(p + 2, '%'))
- g_snprintf(buf, sizeof(buf), cmd, filename);
+ const gchar *cmd, MimeView *mimeview)
+{
+ gchar *p;
+ gchar buf[BUFFSIZE];
+ if (cmd == NULL)
+ mimeview_open_part_with(mimeview, partinfo, TRUE);
else {
- if (cmd)
+ if ((p = strchr(cmd, '%')) && *(p + 1) == 's' &&
+ !strchr(p + 2, '%'))
+ g_snprintf(buf, sizeof(buf), cmd, filename);
+ else {
g_warning("MIME viewer command line is invalid: '%s'", cmd);
- if (def_cmd)
- g_snprintf(buf, sizeof(buf), def_cmd, filename);
- else
- return;
+ mimeview_open_part_with(mimeview, partinfo, FALSE);
+ }
+ if (execute_command_line(buf, TRUE) != 0)
+ mimeview_open_part_with(mimeview, partinfo, FALSE);
}
-
- execute_command_line(buf, TRUE);
}
void mimeview_register_viewer_factory(MimeViewerFactory *factory)
num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "icon_number"));
partinfo = g_object_get_data(G_OBJECT(button), "partinfo");
- icon_selected(mimeview, num, partinfo);
- gtk_widget_grab_focus(button);
- if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
- toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
- if (event->button == 2 || event->button == 3)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
- TRUE);
+ if (event->button != 2) {
+ icon_selected(mimeview, num, partinfo);
+ gtk_widget_grab_focus(button);
+ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+ toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
+ if (event->button == 3)
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
+ TRUE);
+ }
}
-
part_button_pressed(mimeview, event, partinfo);
return FALSE;
gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
}
+void mimeview_select_mimepart_icon(MimeView *mimeview, MimeInfo *partinfo)
+{
+ icon_list_toggle_by_mime_info(mimeview, partinfo);
+ icon_selected(mimeview, -1, partinfo);
+}
+
#undef KEY_PRESS_EVENT_STOP
#define KEY_PRESS_EVENT_STOP() \
g_signal_stop_emission_by_name(G_OBJECT(button), \
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
/* stop the button being untoggled */
KEY_PRESS_EVENT_STOP();
- if (textview_scroll_page(textview, FALSE))
+ if (mimeview_scroll_page(mimeview, FALSE))
return TRUE;
if (icon_list_select_by_number(mimeview, num + 1))
break;
case GDK_BackSpace:
- textview_scroll_page(textview, TRUE);
+ mimeview_scroll_page(mimeview, TRUE);
return TRUE;
case GDK_Return:
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
KEY_PRESS_EVENT_STOP();
- textview_scroll_one_line(textview,
+ mimeview_scroll_one_line(mimeview,
(event->state & GDK_MOD1_MASK) != 0);
return TRUE;
} else {
case GDK_l:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
- mimeview_launch(mimeview);
+ mimeview_launch(mimeview, NULL);
return TRUE;
case GDK_o:
BREAK_ON_MODIFIER_KEY();
KEY_PRESS_EVENT_STOP();
mimeview_open_with(mimeview);
return TRUE;
+ case GDK_c:
+ BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
+ mimeview_check_signature(mimeview);
+ return TRUE;
default:
break;
}
if (!mimeview->messageview->mainwin) return FALSE;
summaryview = mimeview->messageview->mainwin->summaryview;
- summary_pass_key_press_event(summaryview, event);
- return TRUE;
+ return summary_pass_key_press_event(summaryview, event);
}
static void toggle_icon(GtkToggleButton *button, MimeView *mimeview)
switch (privacy_mimeinfo_get_sig_status(siginfo)) {
case SIGNATURE_UNCHECKED:
case SIGNATURE_CHECK_FAILED:
+ case SIGNATURE_CHECK_TIMEOUT:
pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
STOCK_PIXMAP_PRIVACY_EMBLEM_SIGNED, OVERLAY_BOTTOM_RIGHT, 6, 3);
break;
gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
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);
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_CALLBACK(icon_key_pressed), mimeview);
+ g_signal_connect(G_OBJECT(button), "drag_data_get",
+ G_CALLBACK(mimeview_drag_data_get), mimeview);
gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
}
for (; child != NULL; child = g_list_next(child)) {
gtkut_container_remove(GTK_CONTAINER(mimeview->icon_vbox),
GTK_WIDGET(child->data));
+ gtk_widget_destroy(GTK_WIDGET(child->data));
}
+ g_list_free(child);
mimeview->icon_count = 0;
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
gtk_adjustment_set_value(adj, adj->lower);
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 = 5;
+ adj->step_increment = 10;
}
static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
icon_list_create(mimeview, mimeview->mimeinfo);
}
}
+
+void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, GdkEventButton *event, gpointer data)
+{
+ MessageView *msgview = NULL;
+ MainWindow *mainwin = NULL;
+
+ if (!cmd)
+ return;
+
+ msgview = mimeview->messageview;
+ if (!msgview)
+ return;
+
+ mainwin = msgview->mainwin;
+ if (!mainwin)
+ return;
+
+ else if (!strcmp(cmd, "sc://view_log"))
+ log_window_show(mainwin->logwin);
+ else if (!strcmp(cmd, "sc://save_as"))
+ mimeview_save_as(mimeview);
+ else if (!strcmp(cmd, "sc://display_as_text"))
+ mimeview_display_as_text(mimeview);
+ else if (!strcmp(cmd, "sc://open_with"))
+ mimeview_open_with(mimeview);
+ else if (!strcmp(cmd, "sc://open"))
+ mimeview_launch(mimeview, NULL);
+ else if (!strcmp(cmd, "sc://select_attachment") && data != NULL) {
+ icon_list_toggle_by_mime_info(mimeview, (MimeInfo *)data);
+ icon_selected(mimeview, -1, (MimeInfo *)data);
+ } else if (!strcmp(cmd, "sc://open_attachment") && data != NULL) {
+ mimeview_launch(mimeview, (MimeInfo *)data);
+ } else if (!strcmp(cmd, "sc://menu_attachment") && data != NULL) {
+ mimeview->spec_part = (MimeInfo *)data;
+ part_button_pressed(mimeview, event, (MimeInfo *)data);
+ }
+}
+
+gboolean mimeview_scroll_page(MimeView *mimeview, gboolean up)
+{
+ if (mimeview->type == MIMEVIEW_TEXT)
+ return textview_scroll_page(mimeview->textview, up);
+ else if (mimeview->mimeviewer) {
+ MimeViewer *mimeviewer = mimeview->mimeviewer;
+ if (mimeviewer->scroll_page)
+ return mimeviewer->scroll_page(mimeviewer, up);
+ }
+ return TRUE;
+}
+
+void mimeview_scroll_one_line(MimeView *mimeview, gboolean up)
+{
+ if (mimeview->type == MIMEVIEW_TEXT)
+ textview_scroll_one_line(mimeview->textview, up);
+ else if (mimeview->mimeviewer) {
+ MimeViewer *mimeviewer = mimeview->mimeviewer;
+ if (mimeviewer->scroll_one_line)
+ mimeviewer->scroll_one_line(mimeviewer, up);
+ }
+}
projects / claws.git / blobdiff