*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtkscrolledwindow.h>
#include <fnmatch.h>
#endif
-#include "intl.h"
#include "main.h"
#include "mimeview.h"
#include "textview.h"
static void mimeview_open_with (MimeView *mimeview);
static void mimeview_view_file (const gchar *filename,
MimeInfo *partinfo,
- const gchar *cmdline);
+ const gchar *cmdline,
+ MimeView *mimeview);
static gboolean icon_clicked_cb (GtkWidget *button,
GdkEventButton *event,
MimeView *mimeview);
gtk_widget_show(vbox);
siginfoview = noticeview_create(mainwin);
noticeview_hide(siginfoview);
+ noticeview_set_icon_clickable(siginfoview, TRUE);
gtk_box_pack_start(GTK_BOX(vbox), mime_notebook, TRUE, TRUE, 0);
gtk_box_pack_end(GTK_BOX(vbox), GTK_WIDGET_PTR(siginfoview), FALSE, FALSE, 0);
}
}
+#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);
+ else if (defer) {
+ debug_print("deferring free(mimeinfo) and cancelling check\n");
+ mimeview_check_sig_cancel_now(mimeview);
+ }
+}
+
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);
+ }
}
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);
fname = mimeview->file;
if (!fname) return;
- if ((fp = fopen(fname, "rb")) == NULL) {
+ if ((fp = g_fopen(fname, "rb")) == NULL) {
FILE_OP_ERROR(fname, "fopen");
return;
}
return FALSE;
}
+ if (mimeview->mimeviewer != NULL)
+ mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
+
if (mimeview->mimeviewer != viewer) {
- if (mimeview->mimeviewer != NULL)
- mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
mimeview->mimeviewer = viewer;
mimeview_change_view_type(mimeview, MIMEVIEW_VIEWER);
}
void mimeview_clear(MimeView *mimeview)
{
GtkCList *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;
}
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");
+ button_text = _("Check signature");
func = check_signature_cb;
icon = STOCK_PIXMAP_PRIVACY_SIGNED;
break;
case SIGNATURE_OK:
- button_text = _("Full info");
+ button_text = _("View full information");
func = display_full_info_cb;
icon = STOCK_PIXMAP_PRIVACY_PASSED;
break;
case SIGNATURE_WARN:
- button_text = _("Full info");
+ button_text = _("View full information");
func = display_full_info_cb;
icon = STOCK_PIXMAP_PRIVACY_WARN;
break;
case SIGNATURE_INVALID:
- button_text = _("Full info");
+ button_text = _("View full information");
func = display_full_info_cb;
icon = STOCK_PIXMAP_PRIVACY_FAILED;
break;
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(mimeview->siginfoview->text, TRUE);
+
g_free(text);
- noticeview_set_button_text(mimeview->siginfoview, button_text);
+ noticeview_set_button_text(mimeview->siginfoview, NULL);
noticeview_set_button_press_callback(
mimeview->siginfoview,
G_CALLBACK(func),
(gpointer) mimeview);
noticeview_set_icon(mimeview->siginfoview, icon);
+ 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");
+
+ if (mimeinfo == NULL) {
+ /* message changed !? */
+ g_warning("no more siginfo!\n");
+ goto end;
+ }
- privacy_mimeinfo_check_signature(mimeinfo);
- update_signature_noticeview(mimeview, mimeview->siginfo);
+ 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)
+{
+ MimeView *mimeview = (MimeView *) user_data;
+ GtkCTreeNode *node = mimeview->opened;
+ mimeview->opened = NULL;
+ mimeview_selected(GTK_CTREE(mimeview->ctree), node, 0, mimeview);
}
static void display_full_info_cb(GtkWidget *widget, gpointer user_data)
textview_set_text(mimeview->textview, siginfo);
g_free(siginfo);
noticeview_set_button_text(mimeview->siginfoview, NULL);
+ noticeview_set_button_press_callback(
+ mimeview->siginfoview,
+ G_CALLBACK(redisplay_email),
+ (gpointer) mimeview);
+ noticeview_set_tooltip(mimeview->siginfoview, _("Go back to email"));
}
static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
{
MimeInfo *siginfo;
-
+ MimeInfo *first_text;
+
g_return_if_fail(mimeview != NULL);
g_return_if_fail(selected != NULL);
+ if (selected->type == MIMETYPE_MESSAGE
+ && !g_ascii_strcasecmp(selected->subtype, "rfc822")) {
+ /* if the first text part is signed, check that */
+ first_text = selected;
+ while (first_text && first_text->type != MIMETYPE_TEXT) {
+ first_text = procmime_mimeinfo_next(first_text);
+ }
+ if (first_text) {
+ update_signature_info(mimeview, first_text);
+ return;
+ }
+ }
+
siginfo = selected;
while (siginfo != NULL) {
if (privacy_mimeinfo_is_signed(siginfo))
return;
}
- update_signature_noticeview(mimeview, siginfo);
+ update_signature_noticeview(mimeview, siginfo, FALSE, 0);
noticeview_show(mimeview->siginfoview);
}
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;
}
filename = g_strdup(get_part_name(partinfo));
if (!filename || !*filename)
filename = g_strdup_printf("noname.%d", number);
- subst_for_shellsafe_filename(filename);
+
+ if (!g_utf8_validate(filename, -1, NULL)) {
+ gchar *tmp = conv_filename_to_utf8(filename);
+ g_free(filename);
+ filename = tmp;
+ }
+
+ subst_for_filename(filename);
fullname = g_strconcat
(basedir, G_DIR_SEPARATOR_S, (filename[0] == G_DIR_SEPARATOR)
? &filename[1] : filename, NULL);
- subst_chars(fullname, "/\\", G_DIR_SEPARATOR);
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);
+ tmp);
+ g_free(tmp);
aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK,
GTK_STOCK_CANCEL, NULL);
g_free(res);
startdir = g_strconcat(prefs_common.attach_save_dir,
G_DIR_SEPARATOR_S, NULL);
- dirname = filesel_select_file_open_folder(_("Select destination folder"), startdir);
+ dirname = filesel_select_file_save_folder(_("Select destination folder"), startdir);
if (!dirname) {
if (startdir) g_free(startdir);
return;
}
if (!is_dir_exist (dirname)) {
- alertpanel_error(_("`%s' is not a directory."),
+ alertpanel_error(_("'%s' is not a directory."),
dirname);
if (startdir) g_free(startdir);
return;
gchar *filepath = NULL;
gchar *filedir = NULL;
MimeInfo *partinfo;
- const gchar *partname = NULL;
+ gchar *partname = NULL;
if (!mimeview->opened) return;
if (!mimeview->file) return;
}
g_return_if_fail(partinfo != NULL);
- if ((partname = get_part_name(partinfo)) == NULL) {
+ if (get_part_name(partinfo) == NULL) {
return;
}
+ partname = g_strdup(get_part_name(partinfo));
+
+ if (!g_utf8_validate(partname, -1, NULL)) {
+ gchar *tmp = conv_filename_to_utf8(partname);
+ g_free(partname);
+ partname = tmp;
+ }
+ subst_for_filename(partname);
+
if (prefs_common.attach_save_dir)
filepath = g_strconcat(prefs_common.attach_save_dir,
G_DIR_SEPARATOR_S, partname, NULL);
else
filepath = g_strdup(partname);
+ g_free(partname);
+
filename = filesel_select_file_save(_("Save as"), filepath);
if (!filename) {
g_free(filepath);
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);
}
MimeInfo *partinfo;
gchar *filename;
gchar *cmd;
+ gchar *mime_command = NULL;
+ gchar *content_type = NULL;
+ if (!mimeview) return;
if (!mimeview->opened) return;
if (!mimeview->file) return;
prefs_common.mime_open_cmd_history =
add_history(NULL, prefs_common.mime_open_cmd);
+ 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)"),
- prefs_common.mime_open_cmd,
+ "('%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 (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 =
}
static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
- const gchar *cmdline)
+ const gchar *cmdline, MimeView *mimeview)
{
- static gchar *default_image_cmdline = "display '%s'";
- static gchar *default_audio_cmdline = "play '%s'";
+ 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 = "metamail -d -b -x -c %s '%s'";
+ static gchar *mime_cmdline = DEFAULT_MIME_CMD;
gchar buf[1024];
gchar m_buf[1024];
const gchar *cmd;
def_cmd = NULL;
} else if (MIMETYPE_APPLICATION == partinfo->type &&
!g_ascii_strcasecmp(partinfo->subtype, "octet-stream")) {
+ mimeview_open_with(mimeview);
return;
} else if (MIMETYPE_IMAGE == partinfo->type) {
cmd = prefs_common.mime_image_viewer;
g_snprintf(buf, sizeof(buf), cmd, filename);
else {
if (cmd)
- g_warning("MIME viewer command line is invalid: `%s'", cmd);
+ g_warning("MIME viewer command line is invalid: '%s'", cmd);
if (def_cmd)
g_snprintf(buf, sizeof(buf), def_cmd, filename);
- else
+ else {
+ mimeview_open_with(mimeview);
return;
+ }
}
- execute_command_line(buf, TRUE);
+ if (execute_command_line(buf, TRUE) != 0)
+ mimeview_open_with(mimeview);
}
void mimeview_register_viewer_factory(MimeViewerFactory *factory)
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;
}
static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
{
- GtkWidget *pixmap;
+ GtkWidget *pixmap = NULL;
GtkWidget *vbox;
GtkWidget *button;
gchar *tip;
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;
to_human_readable(mimeinfo->length), NULL);
g_free(content_type);
if (desc && *desc) {
- tiptmp = g_strjoin("\n", desc, tip, NULL);
+ gchar *tmp = NULL;
+ if (!g_utf8_validate(desc, -1, NULL)) {
+ tmp = conv_filename_to_utf8(desc);
+ } else {
+ tmp = g_strdup(desc);
+ }
+ tiptmp = g_strjoin("\n", tmp, tip, NULL);
g_free(tip);
tip = tiptmp;
+ g_free(tmp);
}
if (sigshort && *sigshort) {
tiptmp = g_strjoin("\n", tip, sigshort, NULL);
}
mimeview->icon_count = 0;
adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
- adj->value = adj->lower;
+ gtk_adjustment_set_value(adj, adj->lower);
}
static void icon_list_toggle_by_mime_info(MimeView *mimeview,