/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 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 "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 "timing.h"
#include "manage_window.h"
#include "privacy.h"
+#include "file-utils.h"
typedef enum
{
MimeInfo *partinfo);
static void mimeview_change_view_type (MimeView *mimeview,
MimeViewType type);
-static gchar *mimeview_get_filename_for_part (MimeInfo *partinfo,
+static gchar *mimeview_get_filename_for_part (MimeInfo *partinfo,
const gchar *basedir,
gint number);
static gboolean mimeview_write_part (const gchar *filename,
- MimeInfo *partinfo);
+ MimeInfo *partinfo,
+ gboolean handle_error);
static void mimeview_selected (GtkTreeSelection *selection,
MimeView *mimeview);
}
static GtkActionEntry mimeview_menu_actions[] = {
- { "MimeView", NULL, "MimeView" },
+ { "MimeView", NULL, "MimeView", NULL, NULL, NULL },
{ "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) },
G_TYPE_POINTER);
ctree = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+ g_object_unref(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);
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);
mime_notebook = gtk_notebook_new();
gtk_widget_show(mime_notebook);
- gtkut_widget_set_can_focus(mime_notebook, FALSE);
+ gtk_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);
mimeview->icon_mainbox = icon_mainbox;
mimeview->icon_count = 0;
mimeview->mainwin = mainwin;
-#if !(GTK_CHECK_VERSION(2,12,0))
- mimeview->tooltips = tips;
-#endif
mimeview->mime_toggle = mime_toggle;
mimeview->siginfoview = siginfoview;
mimeview->scrollbutton = scrollbutton;
mimeview->check_data->free_after_use = TRUE;
#endif
if (mimeview->mimeinfo != NULL && !defer) {
- procmime_mimeinfo_free_all(mimeview->mimeinfo);
+ procmime_mimeinfo_free_all(&mimeview->mimeinfo);
mimeview->mimeinfo = NULL;
} else if (defer) {
#ifdef USE_PTHREAD
MimeInfo *mimeview_get_selected_part(MimeView *mimeview)
{
- 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;
+ return gtkut_tree_view_get_selected_pointer(
+ GTK_TREE_VIEW(mimeview->ctree), COL_DATA,
+ NULL, NULL, NULL);
}
MimeInfo *mimeview_get_node_part(MimeView *mimeview, GtkTreePath *path)
GtkTreePath *path;
gint i = 0;
- gtk_tree_model_get_iter_first(model, &iter);
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ return -1;
path = gtk_tree_model_get_path(model, &iter);
do {
if (i < 0)
return;
- gtk_tree_model_get_iter_first(model, &iter);
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ return;
path = gtk_tree_model_get_path(model, &iter);
while (x != i) {
fname = mimeview->file;
if (!fname) return;
- if ((fp = g_fopen(fname, "rb")) == NULL) {
- FILE_OP_ERROR(fname, "fopen");
+ if ((fp = claws_fopen(fname, "rb")) == NULL) {
+ FILE_OP_ERROR(fname, "claws_fopen");
return;
}
if (fseek(fp, partinfo->offset, SEEK_SET) < 0) {
FILE_OP_ERROR(mimeview->file, "fseek");
- fclose(fp);
+ claws_fclose(fp);
return;
}
mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
textview_show_part(mimeview->textview, partinfo, fp);
- fclose(fp);
+ claws_fclose(fp);
}
static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *content_type)
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)
(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
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);
+ procmime_mimeinfo_free_all(&mimeview->check_data->siginfo);
}
+
+ g_free(mimeview->check_data);
+ mimeview->check_data = NULL;
+
if (must_destroy) {
debug_print("freeing deferred mimeview\n");
mimeview_free_mimeinfo(mimeview);
g_free(mimeview);
mimeviews = g_slist_remove(mimeviews, mimeview);
}
-
}
/* 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;
} 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;
}
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);
}
}
GtkTreeIter iter;
GtkTreePath *path;
MimeInfo *partinfo;
+ MainWindow *mainwin;
selection = gtk_tree_view_get_selection(ctree);
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
break;
}
}
+ mainwin = mainwindow_get_mainwindow();
+ if (mainwin)
+ main_window_set_menu_sensitive(mainwin);
+
+ 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_launch(mimeview, partinfo);
return TRUE;
} else if (event->button == 3) {
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+
if (partinfo && (partinfo->type == MIMETYPE_MESSAGE ||
partinfo->type == MIMETYPE_IMAGE ||
partinfo->type == MIMETYPE_MULTIPART))
else
#endif
cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/Open", TRUE);
-
+ if (mainwin)
+ main_window_set_menu_sensitive(mainwin);
g_object_set_data(G_OBJECT(mimeview->popupmenu),
"pop_partinfo", partinfo);
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:
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:
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);
+ fp = claws_fopen(partinfo->data.filename, "rb");
+ 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)
+ claws_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);
* \param partinfo Attachment to save
*/
static gboolean mimeview_write_part(const gchar *filename,
- MimeInfo *partinfo)
+ MimeInfo *partinfo,
+ gboolean handle_error)
{
gchar *dir;
gint err;
res = g_strdup_printf(_("Overwrite existing file '%s'?"),
tmp);
g_free(tmp);
- aval = alertpanel(_("Overwrite"), res, GTK_STOCK_CANCEL,
- GTK_STOCK_OK, NULL);
- g_free(res);
+ aval = alertpanel(_("Overwrite"), res, GTK_STOCK_CANCEL,
+ GTK_STOCK_OK, NULL, ALERTFOCUS_FIRST);
+ g_free(res);
if (G_ALERTALTERNATE != aval) return FALSE;
}
if ((err = procmime_get_part(filename, partinfo)) < 0) {
- alertpanel_error
- (_("Couldn't save the part of multipart message: %s"),
- strerror(-err));
+ debug_print("error saving MIME part: %d\n", err);
+ if (handle_error)
+ alertpanel_error
+ (_("Couldn't save the part of multipart message: %s"),
+ g_strerror(-err));
return FALSE;
}
return TRUE;
}
+static AlertValue mimeview_save_all_error_ask(gint n)
+{
+ gchar *message = g_strdup_printf(
+ _("An error has occurred while saving message part #%d. "
+ "Do you want to cancel operation or skip error and "
+ "continue?"), n);
+ AlertValue av = alertpanel_full(_("Error saving all message parts"),
+ message, GTK_STOCK_CANCEL, _("Skip"), _("Skip all"),
+ ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING);
+ g_free(message);
+ return av;
+}
+
+static void mimeview_save_all_info(gint errors, gint total)
+{
+ if (!errors) {
+ gchar *msg = g_strdup_printf(
+ ngettext("%d file saved successfully.",
+ "%d files saved successfully.",
+ total),
+ total);
+ alertpanel_notice("%s", msg);
+ g_free(msg);
+ } else {
+ gchar *msg1 = g_strdup_printf(
+ ngettext("%d file saved successfully",
+ "%d files saved successfully",
+ total - errors),
+ total - errors);
+ gchar *msg2 = g_strdup_printf(
+ ngettext("%s, %d file failed.",
+ "%s, %d files failed.",
+ errors),
+ msg1, errors);
+ alertpanel_warning("%s", msg2);
+ g_free(msg2);
+ g_free(msg1);
+ }
+}
+
/**
* Menu callback: Save all attached files
* \param mimeview Current display
MimeInfo *partinfo;
gchar *dirname;
gchar *startdir = NULL;
- gint number = 1;
+ gint number = 1, errors = 0;
+ gboolean skip_errors = FALSE;
if (!mimeview->opened) return;
if (!mimeview->file) return;
partinfo = mimeview->mimeinfo;
if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
- startdir = g_strconcat(prefs_common.attach_save_dir,
- G_DIR_SEPARATOR_S, NULL);
+ startdir = g_strconcat(prefs_common.attach_save_dir, G_DIR_SEPARATOR_S, NULL);
else
startdir = g_strdup(get_home_dir());
}
if (!is_dir_exist (dirname)) {
- alertpanel_error(_("'%s' is not a directory."),
- dirname);
+ alertpanel_error(_("'%s' is not a directory."), dirname);
g_free(startdir);
g_free(dirname);
return;
if (partinfo && partinfo->type == MIMETYPE_TEXT)
partinfo = procmime_mimeinfo_next(partinfo);
}
-
+
while (partinfo != NULL) {
if (partinfo->type != MIMETYPE_MESSAGE &&
partinfo->type != MIMETYPE_MULTIPART &&
(partinfo->disposition != DISPOSITIONTYPE_INLINE
|| get_real_part_name(partinfo) != NULL)) {
- gchar *filename = mimeview_get_filename_for_part
- (partinfo, dirname, number++);
+ gchar *filename = mimeview_get_filename_for_part(
+ partinfo, dirname, number++);
- mimeview_write_part(filename, partinfo);
+ gboolean ok = mimeview_write_part(filename, partinfo, FALSE);
g_free(filename);
+ if (!ok) {
+ ++errors;
+ if (!skip_errors) {
+ AlertValue av = mimeview_save_all_error_ask(number - 1);
+ skip_errors = (av == G_ALERTOTHER);
+ if (av == G_ALERTDEFAULT) /* cancel */
+ break;
+ }
+ }
}
partinfo = procmime_mimeinfo_next(partinfo);
}
prefs_common.attach_save_dir = g_filename_to_utf8(dirname,
-1, NULL, NULL, NULL);
g_free(dirname);
+
+ mimeview_save_all_info(errors, number - 1);
}
static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview)
return;
}
- mimeview_write_part(filename, partinfo);
+ mimeview_write_part(filename, partinfo, TRUE);
filedir = g_path_get_dirname(filename);
if (filedir && strcmp(filedir, ".")) {
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);
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;
}
} else
alertpanel_error
(_("Couldn't save the part of multipart message: %s"),
- strerror(-err));
+ g_strerror(-err));
g_free(filename);
}
#ifndef G_OS_WIN32
gchar *p;
gchar buf[BUFFSIZE];
+
if (cmd == NULL)
mimeview_open_part_with(mimeview, partinfo, TRUE);
else {
g_warning("MIME viewer command-line is invalid: '%s'", cmd);
mimeview_open_part_with(mimeview, partinfo, FALSE);
}
- if (execute_command_line(buf, TRUE) != 0) {
+ if (execute_command_line(buf, TRUE, NULL) != 0) {
if (!prefs_common.save_parts_readwrite)
g_chmod(filename, S_IRUSR|S_IWUSR);
mimeview_open_part_with(mimeview, partinfo, FALSE);
}
#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 "
- "lead to compromission of your computer.\n\n"
+ "untrusted binaries is dangerous and could compromise "
+ "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);
+ 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
}
GtkTreePath *path;
MimeInfo *curr = NULL;
- gtk_tree_model_get_iter_first(model, &iter);
+ if (!gtk_tree_model_get_iter_first(model, &iter))
+ return;
path = gtk_tree_model_get_path(model, &iter);
do {
#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;
case SIGNATURE_UNCHECKED:
case SIGNATURE_CHECK_FAILED:
case SIGNATURE_CHECK_TIMEOUT:
- pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ pixmap = stock_pixmap_widget_with_overlay(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,
+ pixmap = stock_pixmap_widget_with_overlay(stockp,
STOCK_PIXMAP_PRIVACY_EMBLEM_PASSED, OVERLAY_BOTTOM_RIGHT, 6, 3);
break;
case SIGNATURE_WARN:
case SIGNATURE_KEY_EXPIRED:
- pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ pixmap = stock_pixmap_widget_with_overlay(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,
+ pixmap = stock_pixmap_widget_with_overlay(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,
+ pixmap = stock_pixmap_widget_with_overlay(stockp,
STOCK_PIXMAP_PRIVACY_EMBLEM_ENCRYPTED, OVERLAY_BOTTOM_RIGHT, 6, 3);
} else {
- pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp, 0,
+ pixmap = stock_pixmap_widget_with_overlay(stockp, 0,
OVERLAY_NONE, 6, 3);
}
gtk_container_add(GTK_CONTAINER(button), pixmap);
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);
}
+ escaped = g_markup_escape_text(tmp,-1);
+
tiptmp = g_strconcat(tip, "\n<b>",
prefs_common.attach_desc && mimeinfo->description ?
_("Description:") : _("Filename:"),
- " </b>", g_markup_escape_text(tmp,-1), NULL);
+ " </b>", escaped, NULL);
g_free(tip);
tip = tiptmp;
g_free(tmp);
+ g_free(escaped);
}
if (sigshort && *sigshort) {
tiptmp = g_strjoin("\n", tip, g_markup_escape_text(sigshort, -1), NULL);
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,
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);