#include "utils.h"
#include "gtkutils.h"
#include "prefs_common.h"
-#include "rfc2015.h"
#include "stock_pixmap.h"
#include "gtk/gtkvscrollbutton.h"
gtk_widget_show(scrolledwin);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC);
ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
gtk_widget_show(ctree);
g_signal_connect(G_OBJECT(ctree), "tree_select_row",
G_CALLBACK(mimeview_selected), mimeview);
- g_signal_connect(G_OBJECT(ctree), "button_press_event",
+ 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);
gchar *str[N_MIMEVIEW_COLS];
if (partinfo->type != MIMETYPE_UNKNOWN && partinfo->subtype) {
- g_snprintf(content_type, 64, "%s/%s", procmime_get_type_str(partinfo->type), 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");
}
MimeViewer *viewer = NULL;
if ((partinfo->type == MIMETYPE_APPLICATION) &&
- (!g_strcasecmp(partinfo->subtype, "octet-stream"))) {
+ (!g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))) {
const gchar *filename;
filename = procmime_mimeinfo_get_parameter(partinfo, "filename");
return viewer;
}
-static gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
+gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
{
MimeViewer *viewer;
switch (type) {
case MIMEVIEW_TEXT:
- gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->mime_notebook),
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(mimeview->mime_notebook),
gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook),
GTK_WIDGET_PTR(textview)));
break;
case MIMEVIEW_VIEWER:
- gtk_notebook_set_page(GTK_NOTEBOOK(mimeview->mime_notebook),
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(mimeview->mime_notebook),
gtk_notebook_page_num(GTK_NOTEBOOK(mimeview->mime_notebook),
GTK_WIDGET(mimeview->mimeviewer->get_widget(mimeview->mimeviewer))));
break;
static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
{
gchar *text = NULL, *button_text = NULL;
- GtkSignalFunc func = NULL;
+ void *func = NULL;
StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
g_return_if_fail(mimeview != NULL);
noticeview_set_button_text(mimeview->siginfoview, button_text);
noticeview_set_button_press_callback(
mimeview->siginfoview,
- func,
+ G_CALLBACK(func),
(gpointer) mimeview);
noticeview_set_icon(mimeview->siginfoview, icon);
}
privacy_mimeinfo_check_signature(mimeinfo);
update_signature_noticeview(mimeview, mimeview->siginfo);
+ icon_list_clear(mimeview);
+ icon_list_create(mimeview, mimeview->mimeinfo);
}
static void display_full_info_cb(GtkWidget *widget, gpointer user_data)
return FALSE;
}
+/* from gdkevents.c */
+#define DOUBLE_CLICK_TIME 250
+
static gboolean part_button_pressed(MimeView *mimeview, GdkEventButton *event,
MimeInfo *partinfo)
{
+ static MimeInfo *lastinfo;
+ static guint32 lasttime;
+
if (event->button == 2 ||
- (event->button == 1 && event->type == GDK_2BUTTON_PRESS)) {
+ (event->button == 1 && (event->time - lasttime) < DOUBLE_CLICK_TIME && lastinfo == partinfo)) {
/* call external program for image, audio or html */
mimeview_launch(mimeview);
return TRUE;
"/Display as text", TRUE);
if (partinfo &&
partinfo->type == MIMETYPE_APPLICATION &&
- !g_strcasecmp(partinfo->subtype, "octet-stream"))
+ !g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))
menu_set_sensitive(mimeview->popupfactory,
"/Open", FALSE);
else
return TRUE;
}
+ lastinfo = partinfo;
+ lasttime = event->time;
return FALSE;
}
#define BREAK_ON_MODIFIER_KEY() \
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
-#warning FIXME_GTK2
-#if 0
#define KEY_PRESS_EVENT_STOP() \
- if (gtk_signal_n_emissions_by_name \
- (GTK_OBJECT(ctree), "key_press_event") > 0) { \
- gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree), \
- "key_press_event"); \
- }
-#else
-#define KEY_PRESS_EVENT_STOP()
-#endif
+ g_signal_stop_emission_by_name(G_OBJECT(ctree), \
+ "key_press_event");
static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
MimeView *mimeview)
if (!event) return FALSE;
if (!mimeview->opened) return FALSE;
+ summaryview = mimeview->messageview->mainwin->summaryview;
+
+ if (summaryview && quicksearch_has_focus(summaryview->quicksearch))
+ return FALSE;
+
switch (event->keyval) {
case GDK_space:
if (textview_scroll_page(mimeview->textview, FALSE))
}
if (!mimeview->messageview->mainwin) return FALSE;
- summaryview = mimeview->messageview->mainwin->summaryview;
+
summary_pass_key_press_event(summaryview, event);
return TRUE;
}
guint time,
MimeView *mimeview)
{
- gchar *filename, *uriname;
+ gchar *filename, *uriname, *tmp;
MimeInfo *partinfo;
if (!mimeview->opened) return;
partinfo = mimeview_get_selected_part(mimeview);
if (!partinfo) return;
- filename = g_basename(get_part_name(partinfo));
+ filename = g_path_get_basename(get_part_name(partinfo));
if (*filename == '\0') return;
+ tmp = filename;
+
filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
filename, 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, NULL);
+ uriname = g_strconcat("file://", filename, NULL);
gtk_selection_data_set(selection_data, selection_data->target, 8,
uriname, strlen(uriname));
{
gchar *dir;
- dir= g_dirname(filename);
+ dir= g_path_get_dirname(filename);
if (!is_dir_exist(dir))
make_dir_hier(dir);
g_free(dir);
res = g_strdup_printf(_("Overwrite existing file '%s'?"),
filename);
- aval = alertpanel(_("Overwrite"), res, _("OK"),
- _("Cancel"), NULL);
+ aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK,
+ GTK_STOCK_CANCEL, NULL);
g_free(res);
if (G_ALERTDEFAULT != aval) return FALSE;
}
startdir = g_strconcat(prefs_common.attach_save_dir,
G_DIR_SEPARATOR_S, NULL);
- dirname = filesel_select_file(_("Select destination folder"), startdir);
+ dirname = filesel_select_file_open_folder(_("Select destination folder"), startdir);
if (!dirname) {
if (startdir) g_free(startdir);
return;
if (dirname[strlen(dirname)-1] == G_DIR_SEPARATOR)
dirname[strlen(dirname)-1] = '\0';
+ /* Skip the first part, that is sometimes DISPOSITIONTYPE_UNKNOWN */
+ if (partinfo && partinfo->type == MIMETYPE_MESSAGE)
+ partinfo = procmime_mimeinfo_next(partinfo);
+ if (partinfo && partinfo->type == MIMETYPE_MULTIPART) {
+ partinfo = procmime_mimeinfo_next(partinfo);
+ if (partinfo && partinfo->type == MIMETYPE_TEXT)
+ partinfo = procmime_mimeinfo_next(partinfo);
+ }
+
while (partinfo != NULL) {
if (partinfo->type != MIMETYPE_MESSAGE &&
partinfo->type != MIMETYPE_MULTIPART &&
static void mimeview_save_as(MimeView *mimeview)
{
gchar *filename;
- gchar *defname = NULL;
gchar *filepath = NULL;
gchar *filedir = NULL;
MimeInfo *partinfo;
}
g_return_if_fail(partinfo != NULL);
- if ((partname = get_part_name(partinfo)) != NULL) {
- Xstrdup_a(defname, partname, return);
- subst_for_shellsafe_filename(defname);
+ if ((partname = get_part_name(partinfo)) == NULL) {
+ return;
}
if (prefs_common.attach_save_dir)
filepath = g_strconcat(prefs_common.attach_save_dir,
- G_DIR_SEPARATOR_S, defname, NULL);
+ G_DIR_SEPARATOR_S, partname, NULL);
else
- filepath = g_strdup(defname);
+ filepath = g_strdup(partname);
- filename = filesel_select_file(_("Save as"), filepath);
+ filename = filesel_select_file_save(_("Save as"), filepath);
if (!filename) {
g_free(filepath);
return;
mimeview_write_part(filename, partinfo);
- filedir = g_dirname(filename);
+ filedir = g_path_get_dirname(filename);
if (filedir && strcmp(filedir, ".")) {
if (prefs_common.attach_save_dir)
g_free(prefs_common.attach_save_dir);
cmd = cmdline;
def_cmd = NULL;
} else if (MIMETYPE_APPLICATION == partinfo->type &&
- !g_strcasecmp(partinfo->subtype, "octet-stream")) {
+ !g_ascii_strcasecmp(partinfo->subtype, "octet-stream")) {
return;
} else if (MIMETYPE_IMAGE == partinfo->type) {
cmd = prefs_common.mime_image_viewer;
if (event->button == 2 || event->button == 3)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
TRUE);
- } else {
- g_signal_stop_emission_by_name(G_OBJECT(button), "button_press_event");
}
part_button_pressed(mimeview, event, partinfo);
gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
}
-#warning FIXME_GTK2
-#if 0
#undef KEY_PRESS_EVENT_STOP
#define KEY_PRESS_EVENT_STOP() \
- if (gtk_signal_n_emissions_by_name \
- (GTK_OBJECT(button), "key_press_event") > 0) { \
- gtk_signal_emit_stop_by_name(GTK_OBJECT(button), \
- "key_press_event"); \
- }
-#endif
+ g_signal_stop_emission_by_name(G_OBJECT(button), \
+ "key_press_event");
+
static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
MimeView *mimeview)
{
GtkWidget *vbox;
GtkWidget *button;
gchar *tip;
+ gchar *tiptmp;
const gchar *desc = NULL;
+ gchar *sigshort = NULL;
gchar *content_type;
StockPixmap stockp;
+ MimeInfo *partinfo;
+ MimeInfo *siginfo = NULL;
+ MimeInfo *encrypted = NULL;
vbox = mimeview->icon_vbox;
mimeview->icon_count++;
switch (mimeinfo->type) {
case MIMETYPE_TEXT:
- if (mimeinfo->subtype && !g_strcasecmp(mimeinfo->subtype, "html"))
+ if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "html"))
stockp = STOCK_PIXMAP_MIME_TEXT_HTML;
- else if (mimeinfo->subtype && !g_strcasecmp(mimeinfo->subtype, "enriched"))
+ else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "enriched"))
stockp = STOCK_PIXMAP_MIME_TEXT_ENRICHED;
else
stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
break;
}
- pixmap = stock_pixmap_widget(mimeview->mainwin->window, stockp);
+ partinfo = mimeinfo;
+ while (partinfo != NULL) {
+ if (privacy_mimeinfo_is_signed(partinfo)) {
+ siginfo = partinfo;
+ break;
+ }
+ if (privacy_mimeinfo_is_encrypted(partinfo)) {
+ encrypted = partinfo;
+ break;
+ }
+ partinfo = procmime_mimeinfo_parent(partinfo);
+ }
+
+ if (siginfo != NULL) {
+ switch (privacy_mimeinfo_get_sig_status(siginfo)) {
+ case SIGNATURE_UNCHECKED:
+ case SIGNATURE_CHECK_FAILED:
+ pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ STOCK_PIXMAP_PRIVACY_EMBLEM_SIGNED, OVERLAY_BOTTOM_RIGHT, 6, 3);
+ break;
+ case SIGNATURE_OK:
+ pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ STOCK_PIXMAP_PRIVACY_EMBLEM_PASSED, OVERLAY_BOTTOM_RIGHT, 6, 3);
+ break;
+ case SIGNATURE_WARN:
+ pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ STOCK_PIXMAP_PRIVACY_EMBLEM_WARN, OVERLAY_BOTTOM_RIGHT, 6, 3);
+ break;
+ case SIGNATURE_INVALID:
+ pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ STOCK_PIXMAP_PRIVACY_EMBLEM_FAILED, OVERLAY_BOTTOM_RIGHT, 6, 3);
+ break;
+ }
+ sigshort = privacy_mimeinfo_sig_info_short(siginfo);
+ } else if (encrypted != NULL) {
+ pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ STOCK_PIXMAP_PRIVACY_EMBLEM_ENCRYPTED, OVERLAY_BOTTOM_RIGHT, 6, 3);
+ } else {
+ pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp, 0,
+ OVERLAY_NONE, 6, 3);
+ }
gtk_container_add(GTK_CONTAINER(button), pixmap);
if (!desc) {
content_type = procmime_get_content_type_str(mimeinfo->type,
mimeinfo->subtype);
- if (desc && *desc)
- tip = g_strdup_printf("%s\n%s\n%s", desc, content_type,
- to_human_readable(mimeinfo->length));
- else
- tip = g_strdup_printf("%s\n%s", content_type,
- to_human_readable(mimeinfo->length));
-
+ tip = g_strjoin("\n", content_type,
+ to_human_readable(mimeinfo->length), NULL);
g_free(content_type);
+ if (desc && *desc) {
+ tiptmp = g_strjoin("\n", desc, tip, NULL);
+ g_free(tip);
+ tip = tiptmp;
+ }
+ if (sigshort && *sigshort) {
+ tiptmp = g_strjoin("\n", tip, sigshort, NULL);
+ g_free(tip);
+ tip = tiptmp;
+ }
+ g_free(sigshort);
gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
g_free(tip);
gtk_widget_show_all(button);
- g_signal_connect(G_OBJECT(button), "button_press_event",
+ 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);
mimeview->icon_count = 0;
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
adj->value = adj->lower;
- g_signal_stop_emission_by_name(G_OBJECT (adj), "value_changed");
}
static void icon_list_toggle_by_mime_info(MimeView *mimeview,
mainbox_size = &mimeview->icon_mainbox->allocation;
vbox_size = &mimeview->icon_vbox->allocation;
layout_size = &mimeview->icon_scroll->allocation;
-
-#warning FIXME_GTK2 /* this code cause hang up. */
-#if 0
- /* centralise the vbox */
- gtk_layout_move(GTK_LAYOUT(mimeview->icon_scroll), mimeview->icon_vbox,
- (mainbox_size->width - vbox_size->width)/2, 0);
-#endif
-
+
gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll),
GTK_LAYOUT(mimeview->icon_scroll)->width,
MAX(vbox_size->height, layout_size->height));
static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
{
GtkRequisition size;
- gint width;
+
g_return_if_fail(mimeinfo != NULL);
while (mimeinfo != NULL) {
if (mimeinfo->type != MIMETYPE_MULTIPART)
icon_list_append_icon(mimeview, mimeinfo);
if (mimeinfo->node->children != NULL)
- icon_list_create(mimeview, (MimeInfo *) mimeinfo->node->children->data);
- mimeinfo = mimeinfo->node->next != NULL ? (MimeInfo *) mimeinfo->node->next->data : NULL;
+ icon_list_create(mimeview,
+ (MimeInfo *) mimeinfo->node->children->data);
+ mimeinfo = mimeinfo->node->next != NULL
+ ? (MimeInfo *) mimeinfo->node->next->data
+ : NULL;
}
gtk_widget_size_request(mimeview->icon_vbox, &size);
- width = size.width + 4;
- if (width > mimeview->icon_mainbox->requisition.width) {
+ if (size.width > mimeview->icon_mainbox->requisition.width) {
gtk_widget_set_size_request(mimeview->icon_mainbox,
- width, -1);
+ size.width, -1);
}
}
projects / claws.git / blobdiff