0.9.7claws7

[claws.git] / src / mimeview.c

diff --git a/src/mimeview.c b/src/mimeview.c
index f31eee68005a4da0bb71b59b51924c4df37193bb..4d1f3d008c0e70a255ea9afd990bacd3083c9634 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -394,25 +394,25 @@ static void mimeview_set_multipart_tree(MimeView *mimeview,
        }
 }
 
-static gchar *get_part_name(MimeInfo *partinfo)
+static const gchar *get_part_name(MimeInfo *partinfo)
 {
-       gchar *name;
+       const gchar *name;
 
-       name = g_hash_table_lookup(partinfo->parameters, "name");
-       if(name == NULL)
+       name = procmime_mimeinfo_get_parameter(partinfo, "filename");
+       if (name == NULL)
+               name = procmime_mimeinfo_get_parameter(partinfo, "name");
+       if (name == NULL)
                name = "";
 
        return name;
 }
 
-static gchar *get_part_description(MimeInfo *partinfo)
+static const gchar *get_part_description(MimeInfo *partinfo)
 {
        if (partinfo->description)
                return partinfo->description;
-       else if (g_hash_table_lookup(partinfo->parameters, "name") != NULL)
-               return g_hash_table_lookup(partinfo->parameters, "name");
        else
-               return "";
+               return get_part_name(partinfo);
 }
 
 static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
@@ -433,9 +433,9 @@ static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
        str[COL_MIMETYPE] = content_type;
        str[COL_SIZE] = to_human_readable(partinfo->length);
        if (prefs_common.attach_desc)
-               str[COL_NAME] = get_part_description(partinfo);
+               str[COL_NAME] = (gchar *) get_part_description(partinfo);
        else
-               str[COL_NAME] = get_part_name(partinfo);
+               str[COL_NAME] = (gchar *) get_part_name(partinfo);
 
        node = gtk_ctree_insert_node(ctree, parent, NULL, str, 0,
                                     NULL, NULL, NULL, NULL,
@@ -528,9 +528,12 @@ static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinf
        MimeViewer *viewer = NULL;
 
        if ((partinfo->type == MIMETYPE_APPLICATION) &&
-            (!g_strcasecmp(partinfo->subtype, "octet-stream")) &&
-           (partinfo->name != NULL)) {
-               content_type = procmime_get_mime_type(partinfo->name);
+            (!g_strcasecmp(partinfo->subtype, "octet-stream"))) {
+               const gchar *filename;
+
+               filename = procmime_mimeinfo_get_parameter(partinfo, "name");
+               if (filename != NULL)
+                       content_type = procmime_get_mime_type(filename);
        } else {
                content_type = g_strdup_printf("%s/%s", procmime_get_type_str(partinfo->type), partinfo->subtype);
        }
@@ -668,7 +671,7 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
 static void check_signature_cb(GtkWidget *widget, gpointer user_data)
 {
        MimeView *mimeview = (MimeView *) user_data;
-       MimeInfo *mimeinfo = mimeview_get_selected_part(mimeview);
+       MimeInfo *mimeinfo = mimeview->siginfo;
        
        privacy_mimeinfo_check_signature(mimeinfo);
        update_signature_noticeview(mimeview, mimeview->siginfo);
@@ -677,7 +680,6 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
 static void display_full_info_cb(GtkWidget *widget, gpointer user_data)
 {
        MimeView *mimeview = (MimeView *) user_data;
-       MimeInfo *mimeinfo = mimeview_get_selected_part(mimeview);
        gchar *siginfo;
 
        siginfo = privacy_mimeinfo_sig_info_full(mimeview->siginfo);
@@ -759,7 +761,7 @@ static void mimeview_start_drag(GtkWidget *widget, gint button,
        g_return_if_fail(mimeview != NULL);
 
        partinfo = mimeview_get_selected_part(mimeview);
-       if (partinfo->filename == NULL && partinfo->name == NULL) return;
+       if (partinfo->disposition == DISPOSITIONTYPE_INLINE) return;
 
        context = gtk_drag_begin(widget, mimeview->target_list,
                                 GDK_ACTION_COPY, button, event);
@@ -900,6 +902,11 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                KEY_PRESS_EVENT_STOP();
                mimeview_launch(mimeview);
                return TRUE;
+       case GDK_o:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_open_with(mimeview);
+               return TRUE;
        default:
                break;
        }
@@ -925,10 +932,8 @@ static void mimeview_drag_data_get(GtkWidget           *widget,
 
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) return;
-       if (!partinfo->filename && !partinfo->name) return;
 
-       filename = partinfo->filename ? partinfo->filename : partinfo->name;
-       filename = g_basename(filename);
+       filename = g_basename(get_part_name(partinfo));
        if (*filename == '\0') return;
 
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
@@ -966,6 +971,7 @@ static void mimeview_save_all(MimeView *mimeview)
                alertpanel_error(_("`%s' is not a directory."),
                                 dirname);
                g_free (dirname);
+               dirname = NULL;
                return;
        }
        
@@ -984,8 +990,7 @@ static void mimeview_save_all(MimeView *mimeview)
        while (attachment != NULL) {
                if (attachment->type != MIMETYPE_MESSAGE &&
                    attachment->type != MIMETYPE_MULTIPART &&
-                   (procmime_mimeinfo_get_parameter(attachment, "name") ||
-                    procmime_mimeinfo_get_parameter(attachment, "filename"))) {
+                   attachment->disposition != DISPOSITIONTYPE_INLINE) {
                        static guint subst_cnt = 1;
                        gchar *attachdir;
                        gchar *attachname = g_strdup(get_part_name(attachment));
@@ -1061,7 +1066,7 @@ static void mimeview_save_as(MimeView *mimeview)
        }                        
        g_return_if_fail(partinfo != NULL);
        
-       if ((partname = procmime_mimeinfo_get_parameter(partinfo, "name")) != NULL) {
+       if ((partname = get_part_name(partinfo)) != NULL) {
                Xstrdup_a(defname, partname, return);
                subst_for_filename(defname);
        }
@@ -1368,6 +1373,11 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
                KEY_PRESS_EVENT_STOP();
                mimeview_launch(mimeview);
                return TRUE;
+       case GDK_o:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_open_with(mimeview);
+               return TRUE;
        default:
                break;
        }
@@ -1399,7 +1409,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        GtkWidget *vbox;
        GtkWidget *button;
        gchar *tip;
-       gchar *desc = NULL;
+       const gchar *desc = NULL;
        StockPixmap stockp;
        
        vbox = mimeview->icon_vbox;