2009-10-03 [colin] 3.7.2cvs42
[claws.git] / src / mimeview.c
index fbacdcef593c60097cb0b2444afb25623aaf8d5a..de500fb7ad3ad3445bba11359bc8d5e832e3f21c 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2009 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtktext.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #ifndef HAVE_APACHE_FNMATCH
 /* kludge: apache's fnmatch clashes with <regex.h>, don't include
 #include "gtk/logwindow.h"
 #include "timing.h"
 
+#ifdef MAEMO
+#include <libosso.h>
+#ifndef CHINOOK
+#include <osso-mime.h>
+#else
+#include <hildon-mime.h>
+#endif
+#endif
+
 typedef enum
 {
        COL_MIMETYPE = 0,
@@ -77,10 +75,10 @@ typedef enum
 
 static void mimeview_set_multipart_tree                (MimeView       *mimeview,
                                                 MimeInfo       *mimeinfo,
-                                                GtkCTreeNode   *parent);
-static GtkCTreeNode *mimeview_append_part      (MimeView       *mimeview,
+                                                GtkCMCTreeNode *parent);
+static GtkCMCTreeNode *mimeview_append_part    (MimeView       *mimeview,
                                                 MimeInfo       *partinfo,
-                                                GtkCTreeNode   *parent);
+                                                GtkCMCTreeNode *parent);
 static void mimeview_show_message_part         (MimeView       *mimeview,
                                                 MimeInfo       *partinfo);
 static void mimeview_change_view_type          (MimeView       *mimeview,
@@ -91,8 +89,8 @@ static gchar *mimeview_get_filename_for_part          (MimeInfo       *partinfo,
 static gboolean mimeview_write_part            (const gchar    *filename,
                                                 MimeInfo       *partinfo);
 
-static void mimeview_selected          (GtkCTree       *ctree,
-                                        GtkCTreeNode   *node,
+static void mimeview_selected          (GtkCMCTree     *ctree,
+                                        GtkCMCTreeNode *node,
                                         gint            column,
                                         MimeView       *mimeview);
 static void mimeview_start_drag        (GtkWidget      *widget,
@@ -121,10 +119,14 @@ static void mimeview_save_as              (MimeView       *mimeview);
 static void mimeview_save_all          (MimeView       *mimeview);
 static void mimeview_launch            (MimeView       *mimeview,
                                         MimeInfo       *partinfo);
+#ifndef G_OS_WIN32
 static void mimeview_open_with         (MimeView       *mimeview);
 static void mimeview_open_part_with    (MimeView       *mimeview,
                                         MimeInfo       *partinfo,
                                         gboolean        automatic);
+#endif
+static void mimeview_select_next_part  (MimeView       *mimeview);
+static void mimeview_select_prev_part  (MimeView       *mimeview);
 static void mimeview_view_file         (const gchar    *filename,
                                         MimeInfo       *partinfo,
                                         const gchar    *cmd,
@@ -138,8 +140,6 @@ static void icon_selected               (MimeView       *mimeview,
 static gint icon_key_pressed            (GtkWidget      *button, 
                                         GdkEventKey    *event,
                                         MimeView       *mimeview);
-static void toggle_icon                        (GtkToggleButton *button,
-                                        MimeView       *mimeview);
 static void icon_list_append_icon      (MimeView       *mimeview, 
                                         MimeInfo       *mimeinfo);
 static void icon_list_create           (MimeView       *mimeview, 
@@ -147,10 +147,8 @@ static void icon_list_create               (MimeView       *mimeview,
 static void icon_list_clear            (MimeView       *mimeview);
 static void icon_list_toggle_by_mime_info (MimeView    *mimeview,
                                           MimeInfo     *mimeinfo);
-static gboolean icon_list_select_by_number(MimeView    *mimeview,
-                                          gint          number);
-static void mime_toggle_button_cb      (GtkWidget      *button,
-                                        MimeView       *mimeview);
+static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
+                                   MimeView *mimeview);
 static gboolean part_button_pressed    (MimeView       *mimeview, 
                                         GdkEventButton *event, 
                                         MimeInfo       *partinfo);
@@ -159,17 +157,49 @@ static void icon_scroll_size_allocate_cb(GtkWidget        *widget,
                                         MimeView       *mimeview);
 static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview);
 
-static void mimeview_launch_cb(MimeView *mimeview)
+static void mimeview_launch_cb(GtkAction *action, gpointer data)
 {
+       MimeView *mimeview = (MimeView *)data;
        mimeview_launch(mimeview, mimeview_get_part_to_use(mimeview));
 }
-static GtkItemFactoryEntry mimeview_popup_entries[] =
+
+#ifndef G_OS_WIN32
+static void mimeview_open_with_cb(GtkAction *action, gpointer data)
+{
+       mimeview_open_with((MimeView *)data);
+}
+#endif
+
+static void mimeview_display_as_text_cb(GtkAction *action, gpointer data)
 {
-       {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},
-       {N_("/Save _all..."),     NULL, mimeview_save_all,        0, NULL},
+       mimeview_display_as_text((MimeView *)data);
+}
+
+static void mimeview_save_as_cb(GtkAction *action, gpointer data)
+{
+       mimeview_save_as((MimeView *)data);
+}
+
+static void mimeview_save_all_cb(GtkAction *action, gpointer data)
+{
+       mimeview_save_all((MimeView *)data);
+}
+
+static void mimeview_select_next_part_cb(GtkAction *action, gpointer data)
+{
+       mimeview_select_next_part((MimeView *)data);
+}
+
+static GtkActionEntry mimeview_menu_actions[] = {
+       { "MimeView", NULL, "MimeView" },
+       { "MimeView/Open", NULL, N_("_Open (l)"), NULL, "Open MIME part", G_CALLBACK(mimeview_launch_cb) },
+#if (!defined MAEMO && !defined G_OS_WIN32)
+       { "MimeView/OpenWith", NULL, N_("Open _with (o)..."), NULL, "Open MIME part with...", G_CALLBACK(mimeview_open_with_cb) },
+#endif
+       { "MimeView/DisplayAsText", NULL, N_("_Display as text (t)"), NULL, "Display as text", G_CALLBACK(mimeview_display_as_text_cb) },
+       { "MimeView/SaveAs", NULL, N_("_Save as (y)..."), NULL, "Save as", G_CALLBACK(mimeview_save_as_cb) },
+       { "MimeView/SaveAll", NULL, N_("Save _all..."), NULL, "Save all parts", G_CALLBACK(mimeview_save_all_cb) },
+       { "MimeView/NextPart", NULL, N_("Next part (a)"), NULL, "Next part", G_CALLBACK(mimeview_select_next_part_cb) }
 };
 
 static GtkTargetEntry mimeview_mime_types[] =
@@ -180,6 +210,32 @@ static GtkTargetEntry mimeview_mime_types[] =
 GSList *mimeviewer_factories;
 GSList *mimeviews;
 
+static GdkCursor *hand_cursor = NULL;
+
+static gboolean mimeview_visi_notify(GtkWidget *widget,
+                                      GdkEventVisibility *event,
+                                      MimeView *mimeview)
+{
+       gdk_window_set_cursor(widget->window, hand_cursor);
+       return FALSE;
+}
+
+static gboolean mimeview_leave_notify(GtkWidget *widget,
+                                     GdkEventCrossing *event,
+                                     MimeView *mimeview)
+{
+       gdk_window_set_cursor(widget->window, NULL);
+       return FALSE;
+}
+
+static gboolean mimeview_enter_notify(GtkWidget *widget,
+                                     GdkEventCrossing *event,
+                                     MimeView *mimeview)
+{
+       gdk_window_set_cursor(widget->window, hand_cursor);
+       return FALSE;
+}
+
 MimeView *mimeview_create(MainWindow *mainwin)
 {
        MimeView *mimeview;
@@ -198,12 +254,15 @@ MimeView *mimeview_create(MainWindow *mainwin)
        GtkWidget *arrow;
        GtkWidget *scrollbutton;
        GtkWidget *hbox;
-       GtkTooltips *tooltips;
-       GtkItemFactory *popupfactory;
        NoticeView *siginfoview;
+       GtkRequisition r;
+
        gchar *titles[N_MIMEVIEW_COLS];
-       gint n_entries;
        gint i;
+       CLAWS_TIP_DECL();
+
+       if (!hand_cursor)
+               hand_cursor = gdk_cursor_new(GDK_HAND2);
 
        debug_print("Creating MIME view...\n");
        mimeview = g_new0(MimeView, 1);
@@ -220,14 +279,14 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
        gtk_widget_show(ctree);
-       gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
-       gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_SIZE,
+       gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
+       gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), COL_SIZE,
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), COL_MIMETYPE, 240);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), COL_SIZE, 90);
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_MIMETYPE, 240);
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_SIZE, 90);
        for (i = 0; i < N_MIMEVIEW_COLS; i++)
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
+               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
 
@@ -259,16 +318,29 @@ MimeView *mimeview_create(MainWindow *mainwin)
        g_signal_connect(G_OBJECT(icon_scroll), "scroll_event",
                         G_CALLBACK(mimeview_scrolled), mimeview);
 
-       mime_toggle = gtk_toggle_button_new();
+       mime_toggle = gtk_event_box_new();
+       gtk_event_box_set_visible_window(GTK_EVENT_BOX(mime_toggle), FALSE);
+
+       g_signal_connect(G_OBJECT(mime_toggle), "motion-notify-event",
+                        G_CALLBACK(mimeview_visi_notify), mimeview);
+       g_signal_connect(G_OBJECT(mime_toggle), "leave-notify-event",
+                        G_CALLBACK(mimeview_leave_notify), mimeview);
+       g_signal_connect(G_OBJECT(mime_toggle), "enter-notify-event",
+                        G_CALLBACK(mimeview_enter_notify), mimeview);
+
+       gtk_container_set_border_width(GTK_CONTAINER(mime_toggle), 2);
        gtk_widget_show(mime_toggle);
+       mimeview->ctree_mode = FALSE;
        arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
        gtk_widget_show(arrow);
+       gtk_widget_size_request(arrow, &r);
        gtk_container_add(GTK_CONTAINER(mime_toggle), arrow);
-       g_signal_connect(G_OBJECT(mime_toggle), "toggled", 
+       g_signal_connect(G_OBJECT(mime_toggle), "button_release_event", 
                         G_CALLBACK(mime_toggle_button_cb), mimeview);
 
        icon_mainbox = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(icon_mainbox);
+       gtk_widget_set_size_request(icon_mainbox, 32, -1);
        gtk_box_pack_start(GTK_BOX(icon_mainbox), mime_toggle, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(icon_mainbox), icon_scroll, TRUE, TRUE, 3);
        gtk_box_pack_end(GTK_BOX(icon_mainbox), scrollbutton, FALSE, FALSE, 0);
@@ -278,11 +350,38 @@ MimeView *mimeview_create(MainWindow *mainwin)
        ctree_mainbox = gtk_hbox_new(FALSE, 0); 
        gtk_box_pack_start(GTK_BOX(ctree_mainbox), scrolledwin, TRUE, TRUE, 0);
 
-       n_entries = sizeof(mimeview_popup_entries) /
-               sizeof(mimeview_popup_entries[0]);
-       popupmenu = menu_create_items(mimeview_popup_entries, n_entries,
-                                     "<MimeView>", &popupfactory, mimeview);
-       tooltips = gtk_tooltips_new();
+       mimeview->ui_manager = gtk_ui_manager_new();
+       mimeview->action_group = cm_menu_create_action_group_full(mimeview->ui_manager,
+                       "MimeView", mimeview_menu_actions,
+                       G_N_ELEMENTS(mimeview_menu_actions), (gpointer)mimeview);
+
+       MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, "/", "Menus", "Menus", GTK_UI_MANAGER_MENUBAR)
+       MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, 
+                       "/Menus/", "MimeView", "MimeView", GTK_UI_MANAGER_MENU);
+       MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, 
+                       "/Menus/MimeView/", "Open", "MimeView/Open",
+                       GTK_UI_MANAGER_MENUITEM);
+#if (!defined MAEMO && !defined G_OS_WIN32)
+       MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, 
+                       "/Menus/MimeView/", "OpenWith", "MimeView/OpenWith",
+                       GTK_UI_MANAGER_MENUITEM);
+#endif
+       MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, 
+                       "/Menus/MimeView/", "DisplayAsText", "MimeView/DisplayAsText",
+                       GTK_UI_MANAGER_MENUITEM);
+       MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, 
+                       "/Menus/MimeView/", "SaveAs", "MimeView/SaveAs",
+                       GTK_UI_MANAGER_MENUITEM);
+       MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, 
+                       "/Menus/MimeView/", "SaveAll", "MimeView/SaveAll",
+                       GTK_UI_MANAGER_MENUITEM);
+       MENUITEM_ADDUI_MANAGER(mimeview->ui_manager, 
+                       "/Menus/MimeView/", "NextPart", "MimeView/NextPart",
+                       GTK_UI_MANAGER_MENUITEM);
+
+       popupmenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+                               gtk_ui_manager_get_widget(mimeview->ui_manager, "/Menus/MimeView")) );
+
 
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(vbox);
@@ -294,7 +393,6 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        paned = gtk_vpaned_new();
        gtk_widget_show(paned);
-       gtk_paned_set_gutter_size(GTK_PANED(paned), 0);
        gtk_paned_pack1(GTK_PANED(paned), ctree_mainbox, FALSE, TRUE);
        gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
        
@@ -304,14 +402,15 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        gtk_widget_show(hbox);
        gtk_widget_hide(ctree_mainbox);
-
+#ifdef GENERIC_UMPC
+       gtk_widget_set_size_request(mime_toggle, -1, r.height + 8);
+#endif
        mimeview->hbox          = hbox;
        mimeview->paned         = paned;
        mimeview->scrolledwin   = scrolledwin;
        mimeview->ctree         = ctree;
        mimeview->mime_notebook = mime_notebook;
        mimeview->popupmenu     = popupmenu;
-       mimeview->popupfactory  = popupfactory;
        mimeview->type          = -1;
        mimeview->ctree_mainbox = ctree_mainbox;
        mimeview->icon_scroll   = icon_scroll;
@@ -319,7 +418,9 @@ MimeView *mimeview_create(MainWindow *mainwin)
        mimeview->icon_mainbox  = icon_mainbox;
        mimeview->icon_count    = 0;
        mimeview->mainwin       = mainwin;
-       mimeview->tooltips      = tooltips;
+#if !(GTK_CHECK_VERSION(2,12,0))
+       mimeview->tooltips      = tips;
+#endif
        mimeview->oldsize       = 60;
        mimeview->mime_toggle   = mime_toggle;
        mimeview->siginfoview   = siginfoview;
@@ -353,13 +454,13 @@ static gboolean any_part_is_signed(MimeInfo *mimeinfo)
 void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
                           const gchar *file)
 {
-       GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+       GtkCMCTreeNode *node;
 
        mimeview_clear(mimeview);
 
-       g_return_if_fail(file != NULL);
-       g_return_if_fail(mimeinfo != NULL);
+       cm_return_if_fail(file != NULL);
+       cm_return_if_fail(mimeinfo != NULL);
 
        mimeview->mimeinfo = mimeinfo;
 
@@ -380,11 +481,11 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
        g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
                                          mimeview_selected, mimeview);
 
-       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
        if (node) {
-               gtk_ctree_select(ctree, node);
+               gtk_cmctree_select(ctree, node);
                icon_list_toggle_by_mime_info
-                       (mimeview, gtk_ctree_node_get_row_data(ctree, node));
+                       (mimeview, gtk_cmctree_node_get_row_data(ctree, node));
                gtkut_ctree_set_focus_row(ctree, node);
        }
 }
@@ -440,16 +541,16 @@ void mimeview_destroy(MimeView *mimeview)
 
 MimeInfo *mimeview_get_selected_part(MimeView *mimeview)
 {
-       return gtk_ctree_node_get_row_data
-               (GTK_CTREE(mimeview->ctree), mimeview->opened);
+       return gtk_cmctree_node_get_row_data
+               (GTK_CMCTREE(mimeview->ctree), mimeview->opened);
 }
 
 gint mimeview_get_selected_part_num(MimeView *mimeview)
 {
        gint i = 0;
-       GList *rows = GTK_CLIST(mimeview->ctree)->row_list;
+       GList *rows = GTK_CMCLIST(mimeview->ctree)->row_list;
        while (rows) {
-               if (mimeview->opened == GTK_CTREE_NODE(rows))
+               if (mimeview->opened == GTK_CMCTREE_NODE(rows))
                        return i;
                i++;
                rows = rows->next;
@@ -461,18 +562,18 @@ void mimeview_select_part_num(MimeView *mimeview, gint i)
 {
        if (i < 0)
                return;
-       gtk_clist_unselect_all(GTK_CLIST(mimeview->ctree));
-       gtk_clist_select_row(GTK_CLIST(mimeview->ctree), i, -1);
-       gtkut_clist_set_focus_row(GTK_CLIST(mimeview->ctree), i);
+       gtk_cmclist_unselect_all(GTK_CMCLIST(mimeview->ctree));
+       gtk_cmclist_select_row(GTK_CMCLIST(mimeview->ctree), i, -1);
+       gtkut_clist_set_focus_row(GTK_CMCLIST(mimeview->ctree), i);
 }
 
 static void mimeview_set_multipart_tree(MimeView *mimeview,
                                        MimeInfo *mimeinfo,
-                                       GtkCTreeNode *parent)
+                                       GtkCMCTreeNode *parent)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
-       g_return_if_fail(mimeinfo != NULL);
+       cm_return_if_fail(mimeinfo != NULL);
 
        while (mimeinfo != NULL) {
                node = mimeview_append_part(mimeview, mimeinfo, parent);
@@ -513,12 +614,12 @@ static const gchar *get_part_description(MimeInfo *partinfo)
                return get_part_name(partinfo);
 }
 
-static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
+static GtkCMCTreeNode *mimeview_append_part(MimeView *mimeview,
                                          MimeInfo *partinfo,
-                                         GtkCTreeNode *parent)
+                                         GtkCMCTreeNode *parent)
 {
-       GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+       GtkCMCTreeNode *node;
        static gchar content_type[64];
        gchar *str[N_MIMEVIEW_COLS];
 
@@ -529,16 +630,16 @@ static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
        }
 
        str[COL_MIMETYPE] = content_type;
-       str[COL_SIZE] = to_human_readable(partinfo->length);
+       str[COL_SIZE] = to_human_readable((goffset)partinfo->length);
        if (prefs_common.attach_desc)
                str[COL_NAME] = (gchar *) get_part_description(partinfo);
        else
                str[COL_NAME] = (gchar *) get_part_name(partinfo);
 
        node = gtk_sctree_insert_node(ctree, parent, NULL, str, 0,
-                                    NULL, NULL, NULL, NULL,
+                                    NULL, NULL,
                                     FALSE, TRUE);
-       gtk_ctree_node_set_row_data(ctree, node, partinfo);
+       gtk_cmctree_node_set_row_data(ctree, node, partinfo);
 
        return node;
 }
@@ -575,16 +676,16 @@ static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *
        GSList *cur;
        MimeViewerFactory *factory = NULL;
        MimeViewer *viewer = NULL;
+       gchar *real_contenttype = NULL;
 
 /*
  * FNM_CASEFOLD is a GNU extension
- * if its not defined copy the string to the stack and
- * convert the copy to lower case
  */
 #ifndef FNM_CASEFOLD
 #define FNM_CASEFOLD 0
-       Xstrdup_a(content_type, content_type, return NULL);
-       g_strdown((gchar *)content_type);
+       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)) {
@@ -592,7 +693,7 @@ static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *
                gint i = 0;
 
                while (curfactory->content_types[i] != NULL) {
-                       if(!fnmatch(curfactory->content_types[i], content_type, FNM_CASEFOLD)) {
+                       if(!fnmatch(curfactory->content_types[i], real_contenttype, FNM_CASEFOLD)) {
                                debug_print("%s\n", curfactory->content_types[i]);
                                factory = curfactory;
                                break;
@@ -602,6 +703,7 @@ static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *
                if (factory != NULL)
                        break;
        }
+       g_free(real_contenttype);
        if (factory == NULL)
                return NULL;
 
@@ -620,6 +722,11 @@ static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *
        return viewer;
 }
 
+gboolean mimeview_has_viewer_for_content_type(MimeView *mimeview, const gchar *content_type)
+{
+       return (get_viewer_for_content_type(mimeview, content_type) != NULL);
+}
+
 static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinfo)
 {
        gchar *content_type = NULL;
@@ -650,6 +757,11 @@ gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
 {
        MimeViewer *viewer;
        
+       if (mimeview->messageview->partial_display_shown) {
+               noticeview_hide(mimeview->messageview->noticeview);
+               mimeview->messageview->partial_display_shown = FALSE;
+       }
+
        viewer = get_viewer_for_mimeinfo(mimeview, partinfo);
        if (viewer == NULL) {
                if (mimeview->mimeviewer != NULL)
@@ -704,7 +816,7 @@ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
 
 void mimeview_clear(MimeView *mimeview)
 {
-       GtkCList *clist = NULL;
+       GtkCMCList *clist = NULL;
        
        if (!mimeview)
                return;
@@ -712,11 +824,11 @@ void mimeview_clear(MimeView *mimeview)
        if (g_slist_find(mimeviews, mimeview) == NULL)
                return;
        
-       clist = GTK_CLIST(mimeview->ctree);
+       clist = GTK_CMCLIST(mimeview->ctree);
        
        noticeview_hide(mimeview->siginfoview);
 
-       gtk_clist_clear(clist);
+       gtk_cmclist_clear(clist);
        textview_clear(mimeview->textview);
        if (mimeview->mimeviewer != NULL)
                mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
@@ -735,7 +847,7 @@ void mimeview_clear(MimeView *mimeview)
 }
 
 static void check_signature_cb(GtkWidget *widget, gpointer user_data);
-void mimeview_check_signature(MimeView *mimeview);
+static 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, 
@@ -746,8 +858,8 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo,
        StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
        SignatureStatus mycode = SIGNATURE_UNCHECKED;
        
-       g_return_if_fail(mimeview != NULL);
-       g_return_if_fail(mimeinfo != NULL);
+       cm_return_if_fail(mimeview != NULL);
+       cm_return_if_fail(mimeinfo != NULL);
        
        if (special)
                mycode = code;
@@ -770,6 +882,11 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo,
                func = display_full_info_cb;
                icon = STOCK_PIXMAP_PRIVACY_WARN;
                break;
+       case SIGNATURE_KEY_EXPIRED:
+               button_text = _("View full information");
+               func = display_full_info_cb;
+               icon = STOCK_PIXMAP_PRIVACY_EXPIRED;
+               break;
        case SIGNATURE_INVALID:
                button_text = _("View full information");
                func = display_full_info_cb;
@@ -968,14 +1085,12 @@ static void mimeview_check_sig_in_thread(MimeView *mimeview)
        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, 
+       /* init thread attributes and create the checker thread */
+       if (pthread_attr_init(&detach) != 0 ||
+           pthread_attr_setdetachstate(&detach, PTHREAD_CREATE_DETACHED) != 0 ||
+           pthread_attr_init(&detach2) != 0 ||
+           pthread_attr_setdetachstate(&detach2, PTHREAD_CREATE_DETACHED) != 0 ||
+           pthread_create(&th, &detach, 
                        mimeview_check_sig_worker_thread, 
                        mimeview) != 0) {
                /* arh. We'll do it synchronously. */
@@ -1006,7 +1121,7 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
 #endif
        noticeview_set_text(mimeview->siginfoview, _("Checking signature..."));
        GTK_EVENTS_FLUSH();
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
+#ifdef USE_PTHREAD
        /* let's do it non-blocking */
        mimeview_check_sig_in_thread(mimeview);
        if (!mimeview->check_data) /* let's check syncronously */
@@ -1020,7 +1135,7 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
        }
 }
 
-void mimeview_check_signature(MimeView *mimeview)
+static void mimeview_check_signature(MimeView *mimeview)
 {
        check_signature_cb(NULL, mimeview);     
 }
@@ -1028,9 +1143,9 @@ void mimeview_check_signature(MimeView *mimeview)
 static void redisplay_email(GtkWidget *widget, gpointer user_data)
 {
        MimeView *mimeview = (MimeView *) user_data;
-       GtkCTreeNode *node = mimeview->opened;
+       GtkCMCTreeNode *node = mimeview->opened;
        mimeview->opened = NULL;
-       mimeview_selected(GTK_CTREE(mimeview->ctree), node, 0, mimeview);
+       mimeview_selected(GTK_CMCTREE(mimeview->ctree), node, 0, mimeview);
 }
 
 static void display_full_info_cb(GtkWidget *widget, gpointer user_data)
@@ -1054,8 +1169,8 @@ 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);
+       cm_return_if_fail(mimeview != NULL);
+       cm_return_if_fail(selected != NULL);
        
        if (selected->type == MIMETYPE_MESSAGE 
        &&  !g_ascii_strcasecmp(selected->subtype, "rfc822")) {
@@ -1087,16 +1202,16 @@ static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
        noticeview_show(mimeview->siginfoview);
 }
 
-static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
+static void mimeview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *node, gint column,
                              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);
+       gtk_cmctree_node_moveto(ctree, node, -1, 0.5, 0);
 
-       partinfo = gtk_ctree_node_get_row_data(ctree, node);
+       partinfo = gtk_cmctree_node_get_row_data(ctree, node);
        if (!partinfo) return;
 
        /* ungrab the mouse event */
@@ -1134,7 +1249,7 @@ static void mimeview_start_drag(GtkWidget *widget, gint button,
        GdkDragContext *context;
        MimeInfo *partinfo;
 
-       g_return_if_fail(mimeview != NULL);
+       cm_return_if_fail(mimeview != NULL);
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
@@ -1147,17 +1262,17 @@ static void mimeview_start_drag(GtkWidget *widget, gint button,
 static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                    MimeView *mimeview)
 {
-       GtkCList *clist = GTK_CLIST(widget);
+       GtkCMCList *clist = GTK_CMCLIST(widget);
        gint row, column;
 
        if (!event) return FALSE;
 
        if (event->button == 2 || event->button == 3) {
-               if (!gtk_clist_get_selection_info(clist, event->x, event->y,
+               if (!gtk_cmclist_get_selection_info(clist, event->x, event->y,
                                                  &row, &column))
                        return FALSE;
-               gtk_clist_unselect_all(clist);
-               gtk_clist_select_row(clist, row, column);
+               gtk_cmclist_unselect_all(clist);
+               gtk_cmclist_select_row(clist, row, column);
                gtkut_clist_set_focus_row(clist, row);
        }
        part_button_pressed(mimeview, event, mimeview_get_selected_part(mimeview));
@@ -1196,19 +1311,17 @@ static gboolean part_button_pressed(MimeView *mimeview, GdkEventButton *event,
                if (partinfo && (partinfo->type == MIMETYPE_MESSAGE ||
                                 partinfo->type == MIMETYPE_IMAGE ||
                                 partinfo->type == MIMETYPE_MULTIPART))
-                       menu_set_sensitive(mimeview->popupfactory,
-                                          "/Display as text", FALSE);
+                       cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/DisplayAsText", FALSE);
                else
-                       menu_set_sensitive(mimeview->popupfactory,
-                                          "/Display as text", TRUE);
+                       cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/DisplayAsText", TRUE);
+#ifndef G_OS_WIN32
                if (partinfo &&
                    partinfo->type == MIMETYPE_APPLICATION &&
                    !g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))
-                       menu_set_sensitive(mimeview->popupfactory,
-                                          "/Open", FALSE);
+                       cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/Open", FALSE);
                else
-                       menu_set_sensitive(mimeview->popupfactory,
-                                          "/Open", TRUE);
+#endif
+                       cm_menu_set_sensitive_full(mimeview->ui_manager, "Menus/MimeView/Open", TRUE);
 
                g_object_set_data(G_OBJECT(mimeview->popupmenu),
                                  "pop_partinfo", partinfo);
@@ -1230,6 +1343,48 @@ void mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
        mimeview_key_pressed(mimeview->ctree, event, mimeview);
 }
 
+static void mimeview_select_next_part(MimeView *mimeview)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+       GtkCMCTreeNode *node = mimeview->opened;
+       MimeInfo *partinfo = NULL;
+       
+skip:
+       node = GTK_CMCTREE_NODE_NEXT(node);
+       if (!node)
+               node = gtk_cmctree_node_nth(GTK_CMCTREE(ctree), 0);
+
+       if (node) {
+               partinfo = gtk_cmctree_node_get_row_data(ctree, node);
+               if (partinfo->type == MIMETYPE_MULTIPART)
+                       goto skip;
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+               icon_list_toggle_by_mime_info(mimeview, partinfo);
+       }
+}
+
+static void mimeview_select_prev_part(MimeView *mimeview)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+       GtkCMCTreeNode *node = mimeview->opened;
+       MimeInfo *partinfo = NULL;
+       
+skip:
+       node = GTK_CMCTREE_NODE_PREV(node);
+       if (!node)
+               node = gtk_cmctree_node_nth(GTK_CMCTREE(ctree), GTK_CMCLIST(ctree)->rows - 1);
+
+       if (node) {
+               partinfo = gtk_cmctree_node_get_row_data(ctree, node);
+               if (partinfo->type == MIMETYPE_MULTIPART)
+                       goto skip;
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+               icon_list_toggle_by_mime_info(mimeview, partinfo);
+       }
+}
+
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
@@ -1241,8 +1396,7 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                 MimeView *mimeview)
 {
        SummaryView *summaryview;
-       GtkCTree *ctree = GTK_CTREE(widget);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(widget);
 
        if (!event) return FALSE;
        if (!mimeview->opened) return FALSE;
@@ -1257,36 +1411,29 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                if (mimeview_scroll_page(mimeview, FALSE))
                        return TRUE;
 
-               node = GTK_CTREE_NODE_NEXT(mimeview->opened);
-               if (node) {
-                       gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-                       gtk_sctree_select(GTK_SCTREE(ctree), node);
-                       return TRUE;
-               }
-               break;
+               mimeview_select_next_part(mimeview);
+               return TRUE;
+
        case GDK_BackSpace:
                mimeview_scroll_page(mimeview, TRUE);
                return TRUE;
        case GDK_Return:
+       case GDK_KP_Enter:
                mimeview_scroll_one_line(mimeview,
                                         (event->state & GDK_MOD1_MASK) != 0);
                return TRUE;
        case GDK_n:
        case GDK_N:
                BREAK_ON_MODIFIER_KEY();
-               if (!GTK_CTREE_NODE_NEXT(mimeview->opened)) break;
-               KEY_PRESS_EVENT_STOP();
-               g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical",
-                                       GTK_SCROLL_STEP_FORWARD, 0.0);
+               mimeview_select_next_part(mimeview);
                return TRUE;
+
        case GDK_p:
        case GDK_P:
                BREAK_ON_MODIFIER_KEY();
-               if (!GTK_CTREE_NODE_PREV(mimeview->opened)) break;
-               KEY_PRESS_EVENT_STOP();
-               g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical",
-                                       GTK_SCROLL_STEP_BACKWARD, 0.0);
+               mimeview_select_prev_part(mimeview);
                return TRUE;
+
        case GDK_y:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
@@ -1305,13 +1452,20 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_o:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
+#ifndef G_OS_WIN32
                mimeview_open_with(mimeview);
+#endif
                return TRUE;
        case GDK_c:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
                mimeview_check_signature(mimeview);
                return TRUE;
+       case GDK_a:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_select_next_part(mimeview);
+               return TRUE;
        default:
                break;
        }
@@ -1332,6 +1486,7 @@ static void mimeview_drag_data_get(GtkWidget          *widget,
        gchar *filename = NULL, *uriname, *tmp;
        MimeInfo *partinfo;
        gint err;
+       gint count = 0;
 
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
@@ -1385,6 +1540,30 @@ static void mimeview_drag_data_get(GtkWidget         *widget,
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
                               tmp, NULL);
 
+check_new_file:
+       if (is_file_exist(filename)) {
+               gchar *ext = NULL;
+               gchar *prefix = NULL;
+               gchar *new_name = NULL;
+               if (strrchr(tmp, '.')) {
+                       prefix = g_strdup(tmp);
+                       ext = g_strdup(strrchr(tmp, '.'));
+                       *(strrchr(prefix, '.')) = '\0';
+               } else {
+                       prefix = g_strdup(tmp);
+                       ext = g_strdup("");
+               }
+               count++;
+               new_name = g_strdup_printf("%s.%d%s", prefix, count, ext);
+               g_free(prefix);
+               g_free(ext);
+               g_free(filename);
+               filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
+                              new_name, NULL);
+               g_free(new_name);
+               goto check_new_file;
+       }
+
        g_free(tmp);
 
        if ((err = procmime_get_part(filename, partinfo)) < 0)
@@ -1392,7 +1571,9 @@ static void mimeview_drag_data_get(GtkWidget          *widget,
                        (_("Couldn't save the part of multipart message: %s"), 
                                strerror(-err));
 
-       uriname = g_strconcat("file://", filename, "\r\n", NULL);
+       tmp = g_filename_to_uri(filename, NULL, NULL);
+       uriname = g_strconcat(tmp, "\r\n", NULL);
+       g_free(tmp);
 
        gtk_selection_data_set(selection_data, selection_data->target, 8,
                               (guchar *)uriname, strlen(uriname));
@@ -1415,8 +1596,10 @@ static gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
        gchar *filename;
 
        filename = g_strdup(get_part_name(partinfo));
-       if (!filename || !*filename)
+       if (!filename || !*filename) {
+               g_free(filename);
                filename = g_strdup_printf("noname.%d", number);
+       }
 
        if (!g_utf8_validate(filename, -1, NULL)) {
                gchar *tmp = conv_filename_to_utf8(filename);
@@ -1427,7 +1610,7 @@ static gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
        subst_for_filename(filename);
 
        fullname = g_strconcat
-               (basedir, G_DIR_SEPARATOR_S, (filename[0] == G_DIR_SEPARATOR)
+               (basedir, G_DIR_SEPARATOR_S, (g_path_is_absolute(filename))
                 ? &filename[1] : filename, NULL);
 
        g_free(filename);
@@ -1513,6 +1696,7 @@ static void mimeview_save_all(MimeView *mimeview)
                alertpanel_error(_("'%s' is not a directory."),
                                 dirname);
                g_free(startdir);
+               g_free(dirname);
                return;
        }
 
@@ -1546,6 +1730,7 @@ static void mimeview_save_all(MimeView *mimeview)
        g_free(startdir);
        prefs_common.attach_save_dir = g_filename_to_utf8(dirname,
                                        -1, NULL, NULL, NULL);
+       g_free(dirname);
 }
 
 static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview)
@@ -1584,7 +1769,7 @@ static void mimeview_save_as(MimeView *mimeview)
 
        partinfo = mimeview_get_part_to_use(mimeview);
 
-       g_return_if_fail(partinfo != NULL);
+       cm_return_if_fail(partinfo != NULL);
        
        if (get_part_name(partinfo) == NULL) {
                return;
@@ -1606,7 +1791,7 @@ static void mimeview_save_as(MimeView *mimeview)
 
        subst_for_filename(partname);
        
-       if (prefs_common.attach_save_dir)
+       if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
                filepath = g_strconcat(prefs_common.attach_save_dir,
                                       G_DIR_SEPARATOR_S, partname, NULL);
        else
@@ -1640,7 +1825,7 @@ static void mimeview_display_as_text(MimeView *mimeview)
 
        partinfo = mimeview_get_part_to_use(mimeview);
        mimeview_select_mimepart_icon(mimeview, partinfo);
-       g_return_if_fail(partinfo != NULL);
+       cm_return_if_fail(partinfo != NULL);
        mimeview_show_message_part(mimeview, partinfo);
 }
 
@@ -1655,7 +1840,7 @@ static void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
        if (!partinfo)
                partinfo = mimeview_get_part_to_use(mimeview);
 
-       g_return_if_fail(partinfo != NULL);
+       cm_return_if_fail(partinfo != NULL);
 
        filename = procmime_get_tmp_file_name(partinfo);
 
@@ -1669,6 +1854,7 @@ static void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
        g_free(filename);
 }
 
+#ifndef G_OS_WIN32
 static void mimeview_open_with(MimeView *mimeview)
 {
        MimeInfo *partinfo;
@@ -1682,6 +1868,9 @@ static void mimeview_open_with(MimeView *mimeview)
        mimeview_open_part_with(mimeview, partinfo, FALSE);
 }
 
+#ifdef MAEMO
+osso_context_t *get_osso_context(void);
+#endif
 static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboolean automatic)
 {
        gchar *filename;
@@ -1689,7 +1878,12 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
        gchar *mime_command = NULL;
        gchar *content_type = NULL;
        gint err;
-       g_return_if_fail(partinfo != NULL);
+#ifdef MAEMO
+       DBusConnection *dbusconn;
+       gchar *uri;
+       int r = 0;
+#endif
+       cm_return_if_fail(partinfo != NULL);
 
        filename = procmime_get_tmp_file_name(partinfo);
 
@@ -1700,7 +1894,7 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
                g_free(filename);
                return;
        }
-
+       
        if (!prefs_common.mime_open_cmd_history)
                prefs_common.mime_open_cmd_history =
                        add_history(NULL, prefs_common.mime_open_cmd);
@@ -1715,16 +1909,33 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
                        partinfo->subtype);
        }
        
+#ifdef MAEMO
+       if (content_type != NULL) {
+               uri = g_filename_to_uri(filename, NULL, NULL);
+               dbusconn = osso_get_dbus_connection (get_osso_context());
+#ifdef CHINOOK
+               r = hildon_mime_open_file_with_mime_type (dbusconn, uri, content_type);
+#else
+               r = osso_mime_open_file_with_mime_type (dbusconn, uri, content_type);
+#endif
+               g_free(uri);
+       }
+       if (r != 1) {
+               alertpanel_error(_("No registered viewer for this file type."));
+       }
+       goto out;
+#endif
+       
        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);
+       && prefs_common_get_uri_cmd() && prefs_common.uri_cmd[0]) {
+               mime_command = g_strdup(prefs_common_get_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]) {
+       } else if (partinfo->type != MIMETYPE_TEXT || !prefs_common_get_ext_editor_cmd()
+       ||  !prefs_common_get_ext_editor_cmd()[0]) {
                mime_command = mailcap_get_command_for_type(content_type, filename);
        } else {
-               mime_command = g_strdup(prefs_common.ext_editor_cmd);
+               mime_command = g_strdup(prefs_common_get_ext_editor_cmd());
                g_free(content_type);
                content_type = NULL;
        }
@@ -1743,19 +1954,17 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
                if (content_type != NULL)
                        cmd = input_dialog_combo_remember
                                (_("Open with"),
-                                _("Enter the command line to open file:\n"
+                                _("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);
+                                prefs_common.mime_open_cmd_history, &remember);
                else
                        cmd = input_dialog_combo
                                (_("Open with"),
-                                _("Enter the command line to open file:\n"
+                                _("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);
+                                prefs_common.mime_open_cmd_history);
                if (cmd && remember) {
                        mailcap_update_default(content_type, cmd);
                }
@@ -1770,28 +1979,58 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
                prefs_common.mime_open_cmd_history =
                        add_history(prefs_common.mime_open_cmd_history, cmd);
        }
+#ifdef MAEMO
+out:
+#endif
        g_free(content_type);
        g_free(filename);
 }
+#endif
 
 static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
                               const gchar *cmd, MimeView *mimeview)
 {
+#ifndef G_OS_WIN32
        gchar *p;
        gchar buf[BUFFSIZE];
        if (cmd == NULL)
                mimeview_open_part_with(mimeview, partinfo, TRUE);
        else {
                if ((p = strchr(cmd, '%')) && *(p + 1) == 's' &&
-                   !strchr(p + 2, '%'))
+                   !strchr(p + 2, '%')) {
                        g_snprintf(buf, sizeof(buf), cmd, filename);
-               else {
-                       g_warning("MIME viewer command line is invalid: '%s'", cmd);
+                       if (!prefs_common.save_parts_readwrite)
+                               g_chmod(filename, S_IRUSR);
+                       else
+                               g_chmod(filename, S_IRUSR|S_IWUSR);
+               } 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) != 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) {
+               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"
+                                       "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);
+               }
+       } else
+               ShellExecute(NULL, "open", filename, NULL, NULL, SW_SHOW);
+       
+#endif
 }
 
 void mimeview_register_viewer_factory(MimeViewerFactory *factory)
@@ -1838,22 +2077,20 @@ static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeV
        if (event->button == 1) {
                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);
-               }
        }
        part_button_pressed(mimeview, event, partinfo);
+       icon_list_toggle_by_mime_info(mimeview, partinfo);
 
        return FALSE;
 }
 
 static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
 {
-       GtkCTreeNode *node;
-       node = gtk_ctree_find_by_row_data(GTK_CTREE(mimeview->ctree), NULL, partinfo);
+       GtkCMCTreeNode *node;
+       node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(mimeview->ctree), NULL, partinfo);
 
        if (node)
-               gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
+               gtk_cmctree_select(GTK_CMCTREE(mimeview->ctree), node);
 }              
 
 void mimeview_select_mimepart_icon(MimeView *mimeview, MimeInfo *partinfo)
@@ -1862,11 +2099,6 @@ void mimeview_select_mimepart_icon(MimeView *mimeview, MimeInfo *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), \
-                                       "key_press_event");
-
 static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
                             MimeView *mimeview)
 {
@@ -1884,79 +2116,60 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
 
        switch (event->keyval) {
        case GDK_space:
-               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
-                       /* stop the button being untoggled */
-                       KEY_PRESS_EVENT_STOP();
-                       if (mimeview_scroll_page(mimeview, FALSE))
-                               return TRUE;
-
-                       if (icon_list_select_by_number(mimeview, num + 1))
-                               return TRUE;
-               } else {
-                       icon_selected(mimeview, num, partinfo);
-                       toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
+               if (mimeview_scroll_page(mimeview, FALSE))
                        return TRUE;
-               }
+
+               mimeview_select_next_part(mimeview);
+               return TRUE;
 
                break;
        case GDK_BackSpace:
                mimeview_scroll_page(mimeview, TRUE);
                return TRUE;
        case GDK_Return:
-               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
-                       KEY_PRESS_EVENT_STOP();
-                       mimeview_scroll_one_line(mimeview,
-                                                (event->state & GDK_MOD1_MASK) != 0);
-                       return TRUE;
-               } else {
-                       icon_selected(mimeview, num, partinfo);
-                       toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
-                       return TRUE;
-               }
+       case GDK_KP_Enter:
+               mimeview_scroll_one_line(mimeview,
+                                        (event->state & GDK_MOD1_MASK) != 0);
+               return TRUE;
 
        case GDK_n:
        case GDK_N:
                BREAK_ON_MODIFIER_KEY();
-               if (icon_list_select_by_number(mimeview, num + 1)) {
-                       KEY_PRESS_EVENT_STOP();
-                       return TRUE;
-               }
-               break;
+               mimeview_select_next_part(mimeview);
+               return TRUE;
                
        case GDK_p:
        case GDK_P:
                BREAK_ON_MODIFIER_KEY();
-               if (icon_list_select_by_number(mimeview, num - 1)) {
-                       KEY_PRESS_EVENT_STOP();
-                       return TRUE;
-               }
+               mimeview_select_prev_part(mimeview);
                break;
 
        case GDK_y:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_save_as(mimeview);
                return TRUE;
        case GDK_t:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_display_as_text(mimeview);
                return TRUE;    
        case GDK_l:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_launch(mimeview, NULL);
                return TRUE;
+#ifndef G_OS_WIN32
        case GDK_o:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_open_with(mimeview);
                return TRUE;
+#endif
        case GDK_c:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_check_signature(mimeview);
                return TRUE;
+       case GDK_a:
+               BREAK_ON_MODIFIER_KEY();
+               mimeview_select_next_part(mimeview);
+               return TRUE;
        default:
                break;
        }
@@ -1966,21 +2179,6 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
        return summary_pass_key_press_event(summaryview, event);
 }
 
-static void toggle_icon(GtkToggleButton *button, MimeView *mimeview)
-{
-       GList *child;
-       
-       child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
-       for (; child != NULL; child = g_list_next(child)) {
-               if (GTK_IS_TOGGLE_BUTTON(child->data) && 
-                   GTK_TOGGLE_BUTTON(child->data) != button &&
-                   gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(child->data)))
-                       gtk_toggle_button_set_active
-                               (GTK_TOGGLE_BUTTON(child->data),
-                                FALSE);
-       }
-}
-
 static gboolean icon_popup_menu(GtkWidget *widget, gpointer data)
 {
        MimeView *mimeview = (MimeView *)data;
@@ -2008,11 +2206,25 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        MimeInfo *partinfo;
        MimeInfo *siginfo = NULL;
        MimeInfo *encrypted = NULL;
+#ifdef GENERIC_UMPC
+       GtkRequisition r;
+#endif
+#if !(GTK_CHECK_VERSION(2,12,0))
+       GtkTooltips *tips = mimeview->tooltips;
+#endif
        
        vbox = mimeview->icon_vbox;
        mimeview->icon_count++;
-       button = gtk_toggle_button_new();
-       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+       button = gtk_event_box_new();
+
+       g_signal_connect(G_OBJECT(button), "motion-notify-event",
+                        G_CALLBACK(mimeview_visi_notify), mimeview);
+       g_signal_connect(G_OBJECT(button), "leave-notify-event",
+                        G_CALLBACK(mimeview_leave_notify), mimeview);
+       g_signal_connect(G_OBJECT(button), "enter-notify-event",
+                        G_CALLBACK(mimeview_enter_notify), mimeview);
+
+       gtk_container_set_border_width(GTK_CONTAINER(button), 2);
        g_object_set_data(G_OBJECT(button), "icon_number", 
                          GINT_TO_POINTER(mimeview->icon_count));
        g_object_set_data(G_OBJECT(button), "partinfo", 
@@ -2027,6 +2239,9 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                        stockp = STOCK_PIXMAP_MIME_TEXT_ENRICHED;
                else if  (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "calendar"))
                        stockp = STOCK_PIXMAP_MIME_TEXT_CALENDAR;
+               else if  (mimeinfo->subtype && (!g_ascii_strcasecmp(mimeinfo->subtype, "x-patch")
+                               || !g_ascii_strcasecmp(mimeinfo->subtype, "x-diff")))
+                       stockp = STOCK_PIXMAP_MIME_TEXT_PATCH;
                else
                        stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
                break;
@@ -2034,7 +2249,9 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:
-               if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature"))
+               if (mimeinfo->subtype && (!g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature")
+                   || !g_ascii_strcasecmp(mimeinfo->subtype, "x-pkcs7-signature")
+                   || !g_ascii_strcasecmp(mimeinfo->subtype, "pkcs7-signature")))
                        stockp = STOCK_PIXMAP_MIME_PGP_SIG;
                else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pdf"))
                        stockp = STOCK_PIXMAP_MIME_PDF;
@@ -2080,6 +2297,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                            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,
                            STOCK_PIXMAP_PRIVACY_EMBLEM_WARN, OVERLAY_BOTTOM_RIGHT, 6, 3);
                        break;
@@ -2097,7 +2315,6 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                                                          OVERLAY_NONE, 6, 3);
        }
        gtk_container_add(GTK_CONTAINER(button), pixmap);
-       
        if (!desc) {
                if (prefs_common.attach_desc)
                        desc = get_part_description(mimeinfo);
@@ -2109,7 +2326,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                                                     mimeinfo->subtype);
 
        tip = g_strjoin("\n", content_type,
-                       to_human_readable(mimeinfo->length), NULL);
+                       to_human_readable((goffset)mimeinfo->length), NULL);
        g_free(content_type);
        if (desc && *desc) {
                gchar *tmp = NULL;
@@ -2130,7 +2347,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        }
        g_free(sigshort);
 
-       gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
+       CLAWS_SET_TIP(button, tip);
        g_free(tip);
        gtk_widget_show_all(button);
        gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, 
@@ -2151,41 +2368,28 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        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);
+#ifdef GENERIC_UMPC
+       gtk_widget_size_request(pixmap, &r);
+       gtk_widget_set_size_request(button, -1, r.height + 4);
+#endif
 
 }
 
 static void icon_list_clear (MimeView *mimeview)
 {
-       GList     *child;
+       GList     *child, *orig;
        GtkAdjustment *adj;
                
-       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
-       for (; child != NULL; child = g_list_next(child)) {
+       orig = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
+       for (child = orig; 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);
+       g_list_free(orig);
        mimeview->icon_count = 0;
        adj  = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
        gtk_adjustment_set_value(adj, adj->lower);
-}
-
-static void icon_list_toggle_by_mime_info(MimeView     *mimeview,
-                                         MimeInfo      *mimeinfo)
-{
-       GList *child;
-       
-       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
-       for (; child != NULL; child = g_list_next(child)) {
-               if (GTK_IS_TOGGLE_BUTTON(child->data) &&  
-                   g_object_get_data(G_OBJECT(child->data),
-                                     "partinfo") == (gpointer)mimeinfo) {
-                       toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
-                       gtk_toggle_button_set_active
-                               (GTK_TOGGLE_BUTTON(child->data), TRUE);
-               }                                
-       }
+       gtk_adjustment_changed(adj);
 }
 
 /*!
@@ -2193,31 +2397,6 @@ static void icon_list_toggle_by_mime_info(MimeView       *mimeview,
  *
  *\return       true if the icon 'number' exists and was selected.
  */
-static gboolean icon_list_select_by_number(MimeView    *mimeview,
-                                          gint          number)
-{
-       GList *child;
-
-       if (number == 0) return FALSE;
-       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
-       for (; child != NULL; child = g_list_next(child)) {
-               if (GTK_IS_TOGGLE_BUTTON(child->data) &&  
-                   GPOINTER_TO_INT(g_object_get_data(G_OBJECT(child->data),
-                                       "icon_number")) == number) {
-                       icon_selected(mimeview, number,
-                                     (MimeInfo*)g_object_get_data(G_OBJECT(child->data),
-                                                                  "partinfo"));
-                       toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
-                       gtk_toggle_button_set_active
-                               (GTK_TOGGLE_BUTTON(child->data), TRUE);
-                       gtk_widget_grab_focus(GTK_WIDGET(child->data));
-               
-                       return TRUE;
-               }                                
-       }
-       return FALSE;
-}
-
 static void icon_scroll_size_allocate_cb(GtkWidget *widget, 
                                         GtkAllocation *size, MimeView *mimeview)
 {
@@ -2225,7 +2404,7 @@ static void icon_scroll_size_allocate_cb(GtkWidget *widget,
        GtkAllocation *vbox_size;
        GtkAllocation *layout_size;
        GtkAdjustment *adj;
-       
+
        adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
 
        mainbox_size = &mimeview->icon_mainbox->allocation;
@@ -2242,7 +2421,7 @@ static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
 {
        GtkRequisition size;
 
-       g_return_if_fail(mimeinfo != NULL);
+       cm_return_if_fail(mimeinfo != NULL);
 
        while (mimeinfo != NULL) {
                if (mimeinfo->type != MIMETYPE_MULTIPART)
@@ -2259,15 +2438,44 @@ static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
                gtk_widget_set_size_request(mimeview->icon_mainbox, 
                                            size.width, -1);
        }
+}
 
+static void icon_list_toggle_by_mime_info (MimeView    *mimeview,
+                                          MimeInfo     *mimeinfo)
+{
+       GList *child;
+       
+       child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
+       for (; child != NULL; child = g_list_next(child)) {
+               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);
+               }                        
+       }
 }
 
-static void mime_toggle_button_cb (GtkWidget *button, MimeView *mimeview) 
+static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
+                                   MimeView *mimeview)
 {
-       gtk_widget_ref(button); 
+       g_object_ref(button); 
+
+       mimeview_leave_notify(button, NULL, NULL);
 
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
-               gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_RIGHT, 
+       mimeview->ctree_mode = !mimeview->ctree_mode;
+       if (mimeview->ctree_mode) {
+               gtk_arrow_set(GTK_ARROW(gtk_bin_get_child(GTK_BIN((button)))), GTK_ARROW_RIGHT, 
                                        GTK_SHADOW_NONE);
                gtk_widget_hide(mimeview->icon_mainbox);
                gtk_widget_show(mimeview->ctree_mainbox);
@@ -2277,9 +2485,8 @@ static void mime_toggle_button_cb (GtkWidget *button, MimeView *mimeview)
                                        button);
                gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox), 
                                   button, FALSE, FALSE, 0);
-               gtk_paned_set_gutter_size(GTK_PANED(mimeview->paned), 6);
        } else {
-               gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_LEFT, 
+               gtk_arrow_set(GTK_ARROW(gtk_bin_get_child(GTK_BIN((button)))), GTK_ARROW_LEFT, 
                              GTK_SHADOW_NONE);
                mimeview->oldsize = mimeview->ctree_mainbox->allocation.height;
                gtk_widget_hide(mimeview->ctree_mainbox);
@@ -2293,14 +2500,12 @@ static void mime_toggle_button_cb (GtkWidget *button, MimeView *mimeview)
                gtk_box_reorder_child(GTK_BOX(button->parent), button, 0);
                if (mimeview->opened)
                        icon_list_toggle_by_mime_info
-                               (mimeview, gtk_ctree_node_get_row_data(GTK_CTREE(mimeview->ctree), 
+                               (mimeview, gtk_cmctree_node_get_row_data(GTK_CMCTREE(mimeview->ctree), 
                                                                       mimeview->opened));
 
-               gtk_paned_set_gutter_size(GTK_PANED(mimeview->paned), 0);
        }
-       gtk_widget_grab_focus(button);
-       gtk_widget_unref(button);
-
+       g_object_unref(button);
+       return TRUE;
 }
 
 void mimeview_update (MimeView *mimeview) {
@@ -2335,8 +2540,10 @@ void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, GdkEventButton *e
                mimeview_save_as(mimeview);
        else if (!strcmp(cmd, "sc://display_as_text"))
                mimeview_display_as_text(mimeview);
+#ifndef G_OS_WIN32
        else if (!strcmp(cmd, "sc://open_with"))
                mimeview_open_with(mimeview);
+#endif
        else if (!strcmp(cmd, "sc://open"))
                mimeview_launch(mimeview, NULL);
        else if (!strcmp(cmd, "sc://select_attachment") && data != NULL) {
@@ -2347,6 +2554,15 @@ void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, GdkEventButton *e
        } else if (!strcmp(cmd, "sc://menu_attachment") && data != NULL) {
                mimeview->spec_part = (MimeInfo *)data;
                part_button_pressed(mimeview, event, (MimeInfo *)data);
+       } else if (!strncmp(cmd, "sc://search_tags:", strlen("sc://search_tags:"))) {
+               const gchar *tagname = cmd + strlen("sc://search_tags:");
+               gchar *buf = g_strdup_printf("tag matchcase \"%s\"", tagname);
+               gtk_toggle_button_set_active(
+                               GTK_TOGGLE_BUTTON(mimeview->messageview->mainwin->summaryview->toggle_search), 
+                               TRUE);
+               quicksearch_set(mimeview->messageview->mainwin->summaryview->quicksearch, 
+                               QUICK_SEARCH_EXTENDED, buf);
+               g_free(buf);
        }
 }