don't use Subject for unknown part name
[claws.git] / src / mimeview.c
index 31e97e2ebc4cef6bdc72bc8390007d607bd809fc..2d76d813b8f25c6781c830b9dc5f2910a0d80154 100644 (file)
@@ -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
@@ -404,9 +390,9 @@ static void mimeview_set_multipart_tree(MimeView *mimeview,
        while (mimeinfo != NULL) {
                node = mimeview_append_part(mimeview, mimeinfo, parent);
 
-               if (mimeinfo->children)
-                       mimeview_set_multipart_tree(mimeview, mimeinfo->children, node);
-               mimeinfo = mimeinfo->next;
+               if (mimeinfo->node->children)
+                       mimeview_set_multipart_tree(mimeview, (MimeInfo *) mimeinfo->node->children->data, node);
+               mimeinfo = mimeinfo->node->next != NULL ? (MimeInfo *) mimeinfo->node->next->data : NULL;
        }
 }
 
@@ -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;
@@ -630,6 +616,61 @@ void mimeview_clear(MimeView *mimeview)
        icon_list_clear(mimeview);
 }
 
+static void check_signature_cb(GtkWidget *widget, gpointer user_data);
+
+static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
+{
+       if (privacy_mimeinfo_is_signed(mimeinfo)) {
+               gchar *text = NULL, *button_text = NULL;
+               GtkSignalFunc func = NULL;
+               StockPixmap icon;
+               
+               switch (privacy_mimeinfo_get_sig_status(mimeinfo)) {
+               case SIGNATURE_UNCHECKED:
+                       button_text = _("Check");
+                       func = check_signature_cb;
+                       icon = STOCK_PIXMAP_PRIVACY_SIGNED;
+                       break;
+               case SIGNATURE_OK:
+                       icon = STOCK_PIXMAP_PRIVACY_PASSED;
+                       break;
+               case SIGNATURE_WARN:
+                       icon = STOCK_PIXMAP_PRIVACY_WARN;
+                       break;
+               case SIGNATURE_INVALID:
+                       icon = STOCK_PIXMAP_PRIVACY_FAILED;
+                       break;
+               case SIGNATURE_CHECK_FAILED:
+                       button_text = _("Check again");
+                       func = check_signature_cb;
+                       icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
+               default:
+                       break;
+               }
+               text = privacy_mimeinfo_sig_info_short(mimeinfo);
+               noticeview_set_text(mimeview->siginfoview, text);
+               g_free(text);
+               noticeview_set_button_text(mimeview->siginfoview, button_text);
+               noticeview_set_button_press_callback(
+                       mimeview->siginfoview,
+                       func,
+                       (gpointer) mimeview);
+               noticeview_set_icon(mimeview->siginfoview, icon);
+               noticeview_show(mimeview->siginfoview);
+       } else {
+               noticeview_hide(mimeview->siginfoview);
+       }
+}
+
+static void check_signature_cb(GtkWidget *widget, gpointer user_data)
+{
+       MimeView *mimeview = (MimeView *) user_data;
+       MimeInfo *mimeinfo = mimeview_get_selected_part(mimeview);
+       
+       privacy_mimeinfo_check_signature(mimeinfo);
+       update_signature_noticeview(mimeview, mimeinfo);
+}
+
 static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
                              MimeView *mimeview)
 {
@@ -651,6 +692,8 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
        
        mimeview->textview->default_text = FALSE;
 
+       update_signature_noticeview(mimeview, partinfo);
+
        if (!mimeview_show_part(mimeview, partinfo)) {
                switch (partinfo->type) {
                case MIMETYPE_TEXT:
@@ -880,9 +923,28 @@ 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;
+       if (partinfo->node->parent->children == NULL) return;  /* multipart container? */
+       attachment = partinfo->node->parent->children->next != NULL ?
+           (MimeInfo *) partinfo->node->parent->children->next->data : NULL;
        /* for each attachment, extract it in the selected dir. */
        while (attachment != NULL) {
                static guint subst_cnt = 1;
@@ -915,7 +977,7 @@ static void mimeview_save_all(MimeView *mimeview)
 
                if ((G_ALERTDEFAULT != aval) || (procmime_get_part(buf, attachment) < 0))
                        alertpanel_error(_("Can't save the part of multipart message."));
-               attachment = attachment->next;
+               attachment = attachment->node->next != NULL ? (MimeInfo *) attachment->node->next->data : NULL;
        }
 }
 
@@ -944,6 +1006,7 @@ static void mimeview_save_as(MimeView *mimeview)
        gchar *defname = NULL;
        MimeInfo *partinfo;
        gchar *res;
+       const gchar *partname = NULL;
 
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
@@ -957,11 +1020,9 @@ static void mimeview_save_as(MimeView *mimeview)
                                    "pop_partinfo", NULL);
        }                        
        g_return_if_fail(partinfo != NULL);
-
-       if (partinfo->filename)
-               defname = partinfo->filename;
-       else if (partinfo->name) {
-               Xstrdup_a(defname, partinfo->name, return);
+       
+       if (partname = procmime_mimeinfo_get_parameter(partinfo, "name")) {
+               Xstrdup_a(defname, partname, return);
                subst_for_filename(defname);
        }
 
@@ -1234,17 +1295,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,13 +1379,10 @@ 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"))
-                       stockp = STOCK_PIXMAP_MIME_APPLICATION_OCTET_STREAM;
-               else
-                       stockp = STOCK_PIXMAP_MIME_APPLICATION;
+               stockp = STOCK_PIXMAP_MIME_APPLICATION;
                break;
        case MIMETYPE_IMAGE:
                stockp = STOCK_PIXMAP_MIME_IMAGE;
@@ -1460,15 +1520,12 @@ 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);
-               mimeinfo = mimeinfo->next;
+               if (mimeinfo->node->children != NULL)
+                       icon_list_create(mimeview, (MimeInfo *) mimeinfo->node->children->data);
+               mimeinfo = mimeinfo->node->next != NULL ? (MimeInfo *) mimeinfo->node->next->data : NULL;
        }
        gtk_widget_size_request(mimeview->icon_vbox, &size);
        width = size.width + 4;