}
}
-static gchar *get_part_name(MimeInfo *partinfo)
+static const gchar *get_part_name(MimeInfo *partinfo)
{
- gchar *name;
+ const gchar *name;
- name = g_hash_table_lookup(partinfo->parameters, "name");
- if(name == NULL)
+ name = procmime_mimeinfo_get_parameter(partinfo, "filename");
+ if (name == NULL)
+ name = procmime_mimeinfo_get_parameter(partinfo, "name");
+ if (name == NULL)
name = "";
return name;
}
-static gchar *get_part_description(MimeInfo *partinfo)
+static const gchar *get_part_description(MimeInfo *partinfo)
{
if (partinfo->description)
return partinfo->description;
- else if (g_hash_table_lookup(partinfo->parameters, "name") != NULL)
- return g_hash_table_lookup(partinfo->parameters, "name");
else
- return "";
+ return get_part_name(partinfo);
}
static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
str[COL_MIMETYPE] = content_type;
str[COL_SIZE] = to_human_readable(partinfo->length);
if (prefs_common.attach_desc)
- str[COL_NAME] = get_part_description(partinfo);
+ str[COL_NAME] = (gchar *) get_part_description(partinfo);
else
- str[COL_NAME] = get_part_name(partinfo);
+ str[COL_NAME] = (gchar *) get_part_name(partinfo);
node = gtk_ctree_insert_node(ctree, parent, NULL, str, 0,
NULL, NULL, NULL, NULL,
gint i = 0;
while (curfactory->content_types[i] != NULL) {
- debug_print("%s\n", curfactory->content_types[i]);
if(!fnmatch(curfactory->content_types[i], content_type, FNM_CASEFOLD)) {
+ debug_print("%s\n", curfactory->content_types[i]);
factory = curfactory;
break;
}
MimeViewer *viewer = NULL;
if ((partinfo->type == MIMETYPE_APPLICATION) &&
- (g_strcasecmp(partinfo->subtype, "octet-stream")) &&
- (partinfo->name != NULL)) {
- content_type = procmime_get_mime_type(partinfo->name);
+ (!g_strcasecmp(partinfo->subtype, "octet-stream"))) {
+ const gchar *filename;
+
+ filename = procmime_mimeinfo_get_parameter(partinfo, "filename");
+ if (filename == NULL)
+ filename = procmime_mimeinfo_get_parameter(partinfo, "name");
+ if (filename != NULL)
+ content_type = procmime_get_mime_type(filename);
} else {
content_type = g_strdup_printf("%s/%s", procmime_get_type_str(partinfo->type), partinfo->subtype);
}
}
static void check_signature_cb(GtkWidget *widget, gpointer user_data);
+static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
{
- if (privacy_mimeinfo_is_signed(mimeinfo)) {
- gchar *text = NULL, *button_text = NULL;
- GtkSignalFunc func = NULL;
- StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
-
- switch (privacy_mimeinfo_get_sig_status(mimeinfo)) {
- case SIGNATURE_UNCHECKED:
- button_text = _("Check");
- func = check_signature_cb;
- icon = STOCK_PIXMAP_PRIVACY_SIGNED;
- break;
- case SIGNATURE_OK:
- icon = STOCK_PIXMAP_PRIVACY_PASSED;
- break;
- case SIGNATURE_WARN:
- icon = STOCK_PIXMAP_PRIVACY_WARN;
- break;
- case SIGNATURE_INVALID:
- icon = STOCK_PIXMAP_PRIVACY_FAILED;
- break;
- case SIGNATURE_CHECK_FAILED:
- button_text = _("Check again");
- func = check_signature_cb;
- icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
- default:
- break;
- }
- text = privacy_mimeinfo_sig_info_short(mimeinfo);
- noticeview_set_text(mimeview->siginfoview, text);
- g_free(text);
- noticeview_set_button_text(mimeview->siginfoview, button_text);
- noticeview_set_button_press_callback(
- mimeview->siginfoview,
- func,
- (gpointer) mimeview);
- noticeview_set_icon(mimeview->siginfoview, icon);
- noticeview_show(mimeview->siginfoview);
- } else {
- noticeview_hide(mimeview->siginfoview);
+ gchar *text = NULL, *button_text = NULL;
+ GtkSignalFunc func = NULL;
+ StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
+
+ g_return_if_fail(mimeview != NULL);
+ g_return_if_fail(mimeinfo != NULL);
+
+ switch (privacy_mimeinfo_get_sig_status(mimeinfo)) {
+ case SIGNATURE_UNCHECKED:
+ button_text = _("Check");
+ func = check_signature_cb;
+ icon = STOCK_PIXMAP_PRIVACY_SIGNED;
+ break;
+ case SIGNATURE_OK:
+ button_text = _("Full info");
+ func = display_full_info_cb;
+ icon = STOCK_PIXMAP_PRIVACY_PASSED;
+ break;
+ case SIGNATURE_WARN:
+ button_text = _("Full info");
+ func = display_full_info_cb;
+ icon = STOCK_PIXMAP_PRIVACY_WARN;
+ break;
+ case SIGNATURE_INVALID:
+ button_text = _("Full info");
+ func = display_full_info_cb;
+ icon = STOCK_PIXMAP_PRIVACY_FAILED;
+ break;
+ case SIGNATURE_CHECK_FAILED:
+ button_text = _("Check again");
+ func = check_signature_cb;
+ icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
+ default:
+ break;
}
+ text = privacy_mimeinfo_sig_info_short(mimeinfo);
+ noticeview_set_text(mimeview->siginfoview, text);
+ g_free(text);
+ noticeview_set_button_text(mimeview->siginfoview, button_text);
+ noticeview_set_button_press_callback(
+ mimeview->siginfoview,
+ func,
+ (gpointer) mimeview);
+ noticeview_set_icon(mimeview->siginfoview, icon);
}
static void check_signature_cb(GtkWidget *widget, gpointer user_data)
{
MimeView *mimeview = (MimeView *) user_data;
- MimeInfo *mimeinfo = mimeview_get_selected_part(mimeview);
+ MimeInfo *mimeinfo = mimeview->siginfo;
privacy_mimeinfo_check_signature(mimeinfo);
- update_signature_noticeview(mimeview, 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)
+{
+ MimeView *mimeview = (MimeView *) user_data;
+ gchar *siginfo;
+
+ siginfo = privacy_mimeinfo_sig_info_full(mimeview->siginfo);
+ textview_set_text(mimeview->textview, siginfo);
+ g_free(siginfo);
+ noticeview_set_button_text(mimeview->siginfoview, NULL);
+}
+
+static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
+{
+ MimeInfo *siginfo;
+
+ g_return_if_fail(mimeview != NULL);
+ g_return_if_fail(selected != NULL);
+
+ siginfo = selected;
+ while (siginfo != NULL) {
+ if (privacy_mimeinfo_is_signed(siginfo))
+ break;
+ siginfo = procmime_mimeinfo_parent(siginfo);
+ }
+ mimeview->siginfo = siginfo;
+
+ if (siginfo == NULL) {
+ noticeview_hide(mimeview->siginfoview);
+ return;
+ }
+
+ update_signature_noticeview(mimeview, siginfo);
+ noticeview_show(mimeview->siginfoview);
}
static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
mimeview->textview->default_text = FALSE;
- update_signature_noticeview(mimeview, partinfo);
+ update_signature_info(mimeview, partinfo);
if (!mimeview_show_part(mimeview, partinfo)) {
switch (partinfo->type) {
g_return_if_fail(mimeview != NULL);
partinfo = mimeview_get_selected_part(mimeview);
- if (partinfo->filename == NULL && partinfo->name == NULL) return;
+ if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
context = gtk_drag_begin(widget, mimeview->target_list,
GDK_ACTION_COPY, button, event);
menu_set_sensitive(mimeview->popupfactory,
"/Display as text", TRUE);
if (partinfo &&
- partinfo->type == MIMETYPE_APPLICATION)
+ partinfo->type == MIMETYPE_APPLICATION &&
+ !g_strcasecmp(partinfo->subtype, "octet-stream"))
menu_set_sensitive(mimeview->popupfactory,
"/Open", FALSE);
else
KEY_PRESS_EVENT_STOP();
mimeview_launch(mimeview);
return TRUE;
+ case GDK_o:
+ BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
+ mimeview_open_with(mimeview);
+ return TRUE;
default:
break;
}
partinfo = mimeview_get_selected_part(mimeview);
if (!partinfo) return;
- if (!partinfo->filename && !partinfo->name) return;
- filename = partinfo->filename ? partinfo->filename : partinfo->name;
- filename = g_basename(filename);
+ filename = g_basename(get_part_name(partinfo));
if (*filename == '\0') return;
filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
alertpanel_error(_("`%s' is not a directory."),
dirname);
g_free (dirname);
+ dirname = NULL;
return;
}
while (attachment != NULL) {
if (attachment->type != MIMETYPE_MESSAGE &&
attachment->type != MIMETYPE_MULTIPART &&
- (procmime_mimeinfo_get_parameter(attachment, "name") ||
- procmime_mimeinfo_get_parameter(attachment, "filename"))) {
+ attachment->disposition != DISPOSITIONTYPE_INLINE) {
static guint subst_cnt = 1;
gchar *attachdir;
gchar *attachname = g_strdup(get_part_name(attachment));
}
g_return_if_fail(partinfo != NULL);
- if (partname = procmime_mimeinfo_get_parameter(partinfo, "name")) {
+ if ((partname = get_part_name(partinfo)) != NULL) {
Xstrdup_a(defname, partname, return);
subst_for_filename(defname);
}
if (cmdline) {
cmd = cmdline;
def_cmd = NULL;
- } else if (MIMETYPE_APPLICATION == partinfo->type) {
+ } else if (MIMETYPE_APPLICATION == partinfo->type &&
+ !g_strcasecmp(partinfo->subtype, "octet-stream")) {
return;
} else if (MIMETYPE_IMAGE == partinfo->type) {
cmd = prefs_common.mime_image_viewer;
KEY_PRESS_EVENT_STOP();
mimeview_launch(mimeview);
return TRUE;
+ case GDK_o:
+ BREAK_ON_MODIFIER_KEY();
+ KEY_PRESS_EVENT_STOP();
+ mimeview_open_with(mimeview);
+ return TRUE;
default:
break;
}
}
}
+static GdkColor nocheck_sig_color = {
+ (gulong)0,
+ (gushort)0,
+ (gushort)0,
+ (gushort)0xcfff
+};
+
+static GdkColor good_sig_color = {
+ (gulong)0,
+ (gushort)0,
+ (gushort)0xbfff,
+ (gushort)0
+};
+
+static GdkColor bad_sig_color = {
+ (gulong)0,
+ (gushort)0xffff,
+ (gushort)0,
+ (gushort)0
+};
+
+#define COLOR_BORDER 3
+
+static gboolean icon_drawing_area_expose_event_cb (GtkWidget *widget, GdkEventExpose *expose,
+ gpointer data)
+{
+ GdkColor *color = (GdkColor *)data;
+ GdkDrawable *drawable = widget->window;
+ GdkGC *gc_pix;
+ GdkPixmap *stock_pixmap;
+ GdkBitmap *stock_mask;
+
+ stock_pixmap = (GdkPixmap *)gtk_object_get_data(GTK_OBJECT(widget), "pixmap");
+ stock_mask = (GdkBitmap *)gtk_object_get_data(GTK_OBJECT(widget), "mask");
+
+ g_return_val_if_fail(stock_pixmap != NULL, FALSE);
+ g_return_val_if_fail(stock_mask != NULL, FALSE);
+
+ gc_pix = gdk_gc_new((GdkWindow *)drawable);
+
+ gdk_window_clear_area (drawable, expose->area.x, expose->area.y,
+ expose->area.width, expose->area.height);
+
+ if (color != NULL) {
+ gdk_gc_set_foreground(gc_pix, color);
+ if (color == &good_sig_color) {
+ gdk_draw_rectangle(drawable, gc_pix, TRUE, 0 , 0,
+ widget->allocation.width,
+ widget->allocation.height);
+ } else {
+ gdk_gc_set_line_attributes(gc_pix, COLOR_BORDER - 1, GDK_LINE_ON_OFF_DASH,
+ GDK_CAP_BUTT, GDK_JOIN_MITER);
+ gdk_draw_rectangle(drawable, gc_pix, FALSE, 1 , 1,
+ widget->allocation.width - 2,
+ widget->allocation.height - 2);
+ }
+ }
+
+#define LEFT COLOR_BORDER + widget->allocation.width - widget->requisition.width
+#define TOP COLOR_BORDER + widget->allocation.height - widget->requisition.height
+
+ gdk_gc_set_tile(gc_pix, stock_pixmap);
+ gdk_gc_set_ts_origin(gc_pix, LEFT, TOP);
+ gdk_gc_set_clip_mask(gc_pix, stock_mask);
+ gdk_gc_set_clip_origin(gc_pix, LEFT, TOP);
+ gdk_gc_set_fill(gc_pix, GDK_TILED);
+ gdk_draw_rectangle(drawable, gc_pix, TRUE, LEFT, TOP,
+ widget->requisition.width - COLOR_BORDER * 2,
+ widget->requisition.height - COLOR_BORDER * 2);
+
+ gdk_gc_destroy(gc_pix);
+
+ return TRUE;
+
+}
+
+static GtkWidget* icon_stock_pixmap_with_privacy (GtkWidget *window, StockPixmap icon,
+ MimeInfo *mimeinfo)
+{
+ GdkPixmap *stock_pixmap;
+ GdkBitmap *stock_mask;
+ GtkWidget *widget;
+ GtkWidget *stock_wid;
+ GdkColor *color = NULL;
+ MimeInfo *siginfo;
+ gboolean is_signed = FALSE;
+ gint height;
+ gint width;
+
+ siginfo = mimeinfo;
+ while (siginfo != NULL) {
+ if (privacy_mimeinfo_is_signed(siginfo)) {
+ is_signed = TRUE;
+ if (prefs_common.auto_check_signatures &&
+ (privacy_mimeinfo_get_sig_status(siginfo) == SIGNATURE_UNCHECKED))
+ privacy_mimeinfo_check_signature(siginfo);
+ break;
+ }
+ siginfo = procmime_mimeinfo_parent(siginfo);
+ }
+
+ stock_wid = stock_pixmap_widget(window, icon);
+ gtk_pixmap_get(GTK_PIXMAP(stock_wid), &stock_pixmap, &stock_mask);
+ height = stock_wid->requisition.height;
+ width = stock_wid->requisition.width;
+ gdk_pixmap_ref(stock_pixmap);
+ gdk_pixmap_ref(stock_mask);
+ gtk_widget_destroy(stock_wid);
+
+ widget = gtk_drawing_area_new();
+ gtk_drawing_area_size(GTK_DRAWING_AREA(widget),
+ width + COLOR_BORDER * 2,
+ height + COLOR_BORDER * 2);
+ gtk_object_set_data_full(GTK_OBJECT(widget), "pixmap", stock_pixmap,
+ (GtkDestroyNotify)gdk_pixmap_unref);
+ gtk_object_set_data_full(GTK_OBJECT(widget), "mask", stock_mask,
+ (GtkDestroyNotify)gdk_pixmap_unref);
+
+ if (is_signed) {
+ switch (privacy_mimeinfo_get_sig_status(siginfo)) {
+ case SIGNATURE_UNCHECKED:
+ color = &nocheck_sig_color;
+ break;
+ case SIGNATURE_OK:
+ color = &good_sig_color;
+ break;
+ default:
+ color = &bad_sig_color;
+ break;
+ }
+ if (!color->pixel)
+ gdk_colormap_alloc_color(gtk_widget_get_colormap(widget),
+ color, FALSE, TRUE);
+ } else {
+ color = NULL;
+ }
+ gtk_signal_connect(GTK_OBJECT(widget), "expose_event",
+ GTK_SIGNAL_FUNC
+ (icon_drawing_area_expose_event_cb),
+ color);
+ return widget;
+}
+
+#undef COLOR_BORDER
+
static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
{
GtkWidget *pixmap;
GtkWidget *vbox;
GtkWidget *button;
gchar *tip;
- gchar *desc = NULL;
+ const gchar *desc = NULL;
StockPixmap stockp;
vbox = mimeview->icon_vbox;
break;
}
- pixmap = stock_pixmap_widget(mimeview->mainwin->window, stockp);
+ pixmap = icon_stock_pixmap_with_privacy(mimeview->mainwin->window, stockp,
+ mimeinfo);
gtk_container_add(GTK_CONTAINER(button), pixmap);
if (!desc) {
projects / claws.git / blobdiff