fix a navigation bug (stupid typo of mine)

[claws.git] / src / mimeview.c

diff --git a/src/mimeview.c b/src/mimeview.c
index 31e97e2ebc4cef6bdc72bc8390007d607bd809fc..8d6d465a227489ebd3d8196d0787b4c871544292 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -322,7 +322,6 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
 {
        GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
        GtkCTreeNode *node;
-       FILE *fp;
 
        mimeview_clear(mimeview);
 
@@ -342,20 +341,7 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
        gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
                                           mimeview_selected, mimeview);
 
-       /* search first text part */
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-            node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
-               MimeInfo *partinfo;
-
-               partinfo = gtk_ctree_node_get_row_data(ctree, node);
-               if (partinfo &&
-                   (partinfo->type == MIMETYPE_TEXT))
-                       break;
-       }
-
-       if (!node)
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
+       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
        if (node) {
                gtk_ctree_select(ctree, node);
                icon_list_toggle_by_mime_info
@@ -441,9 +427,9 @@ static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
        gchar *str[N_MIMEVIEW_COLS];
 
        if (partinfo->type != MIMETYPE_UNKNOWN && partinfo->subtype) {
-               snprintf(content_type, 64, "%s/%s", procmime_get_type_str(partinfo->type), partinfo->subtype);
+               g_snprintf(content_type, 64, "%s/%s", procmime_get_type_str(partinfo->type), partinfo->subtype);
        } else {
-               snprintf(content_type, 64, "UNKNOWN");
+               g_snprintf(content_type, 64, "UNKNOWN");
        }
 
        str[COL_MIMETYPE] = content_type;
@@ -651,6 +637,13 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
        
        mimeview->textview->default_text = FALSE;
 
+       if (privacy_mimeinfo_is_signed(partinfo)) {
+               noticeview_set_text(mimeview->siginfoview, "Signed Part");
+               noticeview_show(mimeview->siginfoview);
+       } else {
+               noticeview_hide(mimeview->siginfoview);
+       }
+
        if (!mimeview_show_part(mimeview, partinfo)) {
                switch (partinfo->type) {
                case MIMETYPE_TEXT:
@@ -880,6 +873,24 @@ static void mimeview_save_all(MimeView *mimeview)
        dirname = filesel_select_file(_("Save as"), defname);
        if (!dirname) return;
 
+       if (!is_dir_exist (dirname)) {
+               alertpanel_error(_("`%s' is not a directory."),
+                                dirname);
+               g_free (dirname);
+               return;
+       }
+       
+       { /* add a / after the dirname, in case the user didn't */
+               gchar *dirname_tmp = NULL;
+               int dirname_last_char = strlen (dirname) - 1;
+
+               if (dirname[dirname_last_char] != G_DIR_SEPARATOR) {
+                       dirname_tmp = g_strconcat (dirname, G_DIR_SEPARATOR_S, NULL);
+                       g_free (dirname);
+                       dirname = dirname_tmp;
+               }
+       }
+
        /* return to first children */
        if (!partinfo->parent->children) return;  /* multipart container? */
        attachment = partinfo->parent->children->next;
@@ -1234,17 +1245,19 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
        case GDK_n:
        case GDK_N:
                BREAK_ON_MODIFIER_KEY();
-               if (icon_list_select_by_number(mimeview, num + 1))
+               if (icon_list_select_by_number(mimeview, num + 1)) {
                        KEY_PRESS_EVENT_STOP();
                        return TRUE;
+               }
                break;
                
        case GDK_p:
        case GDK_P:
                BREAK_ON_MODIFIER_KEY();
-               if (icon_list_select_by_number(mimeview, num - 1))
+               if (icon_list_select_by_number(mimeview, num - 1)) {
                        KEY_PRESS_EVENT_STOP();
                        return TRUE;
+               }
                break;
 
        case GDK_y:
@@ -1316,7 +1329,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                        stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
                break;
        case MIMETYPE_MESSAGE:
-               stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
+               stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:
                if (mimeinfo->subtype && !g_strcasecmp(mimeinfo->subtype, "octet-stream"))
@@ -1460,14 +1473,11 @@ static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
        gint           width;
        g_return_if_fail(mimeinfo != NULL);
 
-       if (mimeinfo->children)
-               mimeinfo = mimeinfo->children;
-
        while (mimeinfo != NULL) {
-               if (mimeinfo->children)
-                       icon_list_create(mimeview, mimeinfo);
-               else 
+               if (mimeinfo->type != MIMETYPE_MULTIPART)
                        icon_list_append_icon(mimeview, mimeinfo);
+               if (mimeinfo->children != NULL)
+                       icon_list_create(mimeview, mimeinfo->children);
                mimeinfo = mimeinfo->next;
        }
        gtk_widget_size_request(mimeview->icon_vbox, &size);