Show key icon for encrypted mails in summary view.

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7a527235042d852ae563feeda995efcc17499954..4cb88b3a003028c77f3c9df5fd8a0b9e87a856d9 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,20 @@
+2001-12-27 [darko]     0.6.6claws26
+
+       * src/filtering.c
+       * src/mbox_folder.c
+       * src/messageview.c
+       * src/mh.c
+       * src/procheader.[ch]
+       * src/procmsg.h
+       * src/stock_pixmap.[ch]
+       * src/summaryview.c
+               Show key icon for encrypted mails in summary view
+
+       * src/pixmaps/clip.xpm
+       * src/pixmaps/clipkey.xpm
+       * src/pixmaps/key.xpm
+               New/modified icons for the above
+
 2001-12-27 [melvin]    0.6.6claws25
 
        * src/prefs_common.c

diff --git a/configure.in b/configure.in
index a225753e8588b37b08da9441630a15569003adf3..4905c1e42ee62710a46a903f3e5c5a10e1b5f59f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws25
+EXTRA_VERSION=claws26
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/filtering.c b/src/filtering.c
index 4dd3cb9914cf1fa2fd1ef9a82ca19748ec259d97..b144a3a3cd8516c20ee26828444dcbada05190e1 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -382,7 +382,7 @@ void filter_message(GSList *filtering_list, FolderItem *inbox,
                return;
        }
 
-       msginfo = procheader_parse(filename, msgflags, TRUE);
+       msginfo = procheader_parse(filename, msgflags, TRUE, FALSE);
        
        g_free(filename);
 

diff --git a/src/mbox_folder.c b/src/mbox_folder.c
index e1253832e2529145ff1027ea9dcb16a49f4129db..c69b08b5a1b85f4ffa5d85b868c326ae70a8eb2b 100644 (file)
--- a/src/mbox_folder.c
+++ b/src/mbox_folder.c
@@ -693,7 +693,7 @@ static MsgInfo *mbox_parse_msg(FILE * fp, struct _message * msg,
                }
        }
 
-       msginfo = procheader_file_parse(fp, flags, FALSE);
+       msginfo = procheader_file_parse(fp, flags, FALSE, FALSE);
 
        if (!msginfo) return NULL;
 

diff --git a/src/messageview.c b/src/messageview.c
index 3abff4a46b7b6398e3d47c0a7618c045c25d0e17..0358b459c6800245600e87e0eda7736f82d1cdab 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -431,7 +431,9 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo)
         * in any case, checking tmpmsginfo->flags for MSG_UNREAD
         * fixes the return-receipt-request bug */
 
-       tmpmsginfo = procheader_parse(file, msginfo->flags, TRUE);
+       tmpmsginfo = procheader_parse(file, msginfo->flags, TRUE, TRUE);
+       if (MSG_IS_MIME(tmpmsginfo->flags))
+               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MIME);
 
        if (prefs_common.return_receipt
            && (tmpmsginfo->dispositionnotificationto

diff --git a/src/mh.c b/src/mh.c
index b9996810f6a34443649599d82f659862d2629ceb..4f166f30ea7b162b0701d3fd54a57546fecfc8cd 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -958,7 +958,7 @@ static MsgInfo *mh_parse_msg(const gchar *file, FolderItem *item)
                MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
        }
 
-       msginfo = procheader_parse(file, flags, FALSE);
+       msginfo = procheader_parse(file, flags, FALSE, FALSE);
        if (!msginfo) return NULL;
 
        msginfo->msgnum = atoi(file);

diff --git a/src/pixmaps/clip.xpm b/src/pixmaps/clip.xpm
index c425d203774eff68a887673fdb2e5e95d9336b55..6a555bd9027ef8b7a02a1e6d62fa5381f6211572 100644 (file)
--- a/src/pixmaps/clip.xpm
+++ b/src/pixmaps/clip.xpm
@@ -1,17 +1,17 @@
 /* XPM */
 static char * clip_xpm[] = {
-"6 12 2 1",
+"11 12 2 1",
 "      c None",
 ".     c #000000",
-"  ... ",
-" .   .",
-" .   .",
-"..  ..",
-"..  ..",
-"..  ..",
-"..  ..",
-". .. .",
-".    .",
-".    .",
-" .... ",
-"      "};
+"    ...    ",
+"   .   .   ",
+"   .   .   ",
+"  ..  ..   ",
+"  ..  ..   ",
+"  ..  ..   ",
+"  ..  ..   ",
+"  . .. .   ",
+"  .    .   ",
+"  .    .   ",
+"   ....    ",
+"           "};

diff --git a/src/pixmaps/clipkey.xpm b/src/pixmaps/clipkey.xpm
new file mode 100644 (file)
index 0000000..d7f556d
--- /dev/null
+++ b/src/pixmaps/clipkey.xpm
@@ -0,0 +1,18 @@
+/* XPM */
+static char * clipkey_xpm[] = {
+"11 12 3 1",
+"o      c #040204",
+".      c #fcfe04",
+"       c None",
+"    ooo    ",
+"   o   o   ",
+"   o   o   ",
+"  oo  oo   ",
+"  oo  oo   ",
+"  oo  oooo ",
+"  oo  o...o",
+" ooooo....o",
+"o.......o.o",
+" o.o.o....o",
+"  ooooo...o",
+"       ooo "};

diff --git a/src/pixmaps/key.xpm b/src/pixmaps/key.xpm
new file mode 100644 (file)
index 0000000..d667d46
--- /dev/null
+++ b/src/pixmaps/key.xpm
@@ -0,0 +1,18 @@
+/* XPM */
+static char * key_xpm[] = {
+"11 12 3 1",
+"o      c #040204",
+".      c #fcfe04",
+"       c None",
+"           ",
+"           ",
+"           ",
+"           ",
+"           ",
+"       ooo ",
+"      o...o",
+" ooooo....o",
+"o.......o.o",
+" o.o.o....o",
+"  o o o...o",
+"       ooo "};

diff --git a/src/procheader.c b/src/procheader.c
index af91904e7605541149cfc8fd20baec1689e36ff4..4e450a2b66316ac9206ccf7ee818477998260212 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -437,7 +437,8 @@ enum
        H_RETURN_RECEIPT_TO = 16
 };
 
-MsgInfo *procheader_parse(const gchar *file, MsgFlags flags, gboolean full)
+MsgInfo *procheader_parse(const gchar *file, MsgFlags flags,
+                         gboolean full, gboolean decrypted)
 {
        FILE *fp;
        MsgInfo *msginfo;
@@ -447,7 +448,7 @@ MsgInfo *procheader_parse(const gchar *file, MsgFlags flags, gboolean full)
                return NULL;
        }
 
-       msginfo = procheader_file_parse(fp, flags, full);
+       msginfo = procheader_file_parse(fp, flags, full, decrypted);
 
        fclose(fp);
 
@@ -462,7 +463,7 @@ MsgInfo *procheader_parse(const gchar *file, MsgFlags flags, gboolean full)
 #define ALLOW_HEADER_HINT
 
 MsgInfo *procheader_file_parse(FILE * fp, MsgFlags flags,
-                              gboolean full)
+                              gboolean full, gboolean decrypted)
 {
        static HeaderEntry hentry_full[] = {{"Date:",           NULL, FALSE},
                                           {"From:",            NULL, TRUE},
@@ -521,6 +522,9 @@ MsgInfo *procheader_file_parse(FILE * fp, MsgFlags flags,
        else 
                MSG_SET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
        
+       if (decrypted)
+               MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MIME);
+
        msginfo->inreplyto = NULL;
 
        while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, hentry))
@@ -598,7 +602,18 @@ MsgInfo *procheader_file_parse(FILE * fp, MsgFlags flags,
                        }
                        break;
                case H_CONTENT_TYPE:
-                       if (!strncasecmp(hp, "multipart", 9))
+                       if (decrypted) {
+                               if (!strncasecmp(hp, "multipart", 9) &&
+                                   strncasecmp(hp, "multipart/signed", 16)) {
+                                       MSG_SET_TMP_FLAGS(msginfo->flags,
+                                                         MSG_MIME);
+                               }
+                       }
+                       else if (!strncasecmp(hp, "multipart/encrypted", 19)) {
+                               MSG_SET_TMP_FLAGS(msginfo->flags,
+                                                 MSG_ENCRYPTED);
+                       }
+                       else if (!strncasecmp(hp, "multipart", 9))
                                MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MIME);
                        break;
 #ifdef ALLOW_HEADER_HINT                       

diff --git a/src/procheader.h b/src/procheader.h
index 70383e5e3c6c5196094fd581217dd6fa10fa5ff6..90f7b473c8c137a01b5ea339df603b1be512c420 100644 (file)
--- a/src/procheader.h
+++ b/src/procheader.h
@@ -62,9 +62,12 @@ void procheader_get_header_fields    (FILE           *fp,
                                         HeaderEntry     hentry[]);
 MsgInfo *procheader_parse              (const gchar    *file,
                                         MsgFlags        flags,
-                                        gboolean        full);
-MsgInfo *procheader_file_parse(FILE * fp, MsgFlags flags,
-                              gboolean full);
+                                        gboolean        full,
+                                        gboolean        decrypted);
+MsgInfo *procheader_file_parse         (FILE           *fp,
+                                        MsgFlags        flags,
+                                        gboolean        full,
+                                        gboolean        decrypted);
 
 gchar *procheader_get_fromname         (const gchar    *str);
 

diff --git a/src/procmsg.h b/src/procmsg.h
index c5bc738b7d40dbce43ea46f4f58b4ea5dc066f3d..5b92d89c49a67a8f7a6ca54b25975ef45a83aa54 100644 (file)
--- a/src/procmsg.h
+++ b/src/procmsg.h
@@ -90,7 +90,7 @@ typedef enum
        MSG_CACHED      = 1 << 31
 } MsgTmpFlags;
 
-#define MSG_CACHED_FLAG_MASK   (MSG_MIME)
+#define MSG_CACHED_FLAG_MASK   (MSG_MIME | MSG_ENCRYPTED)
 
 #define MSG_SET_FLAGS(msg, flags)      { (msg) |= (flags); }
 #define MSG_UNSET_FLAGS(msg, flags)    { (msg) &= ~(flags); }

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 96fef6d658c9c043cea369f1f333141be87f37b1..f2f15367396a138834e0a4142dd01fd52642b183 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -30,6 +30,7 @@
 #include "pixmaps/checkbox_off.xpm"
 #include "pixmaps/checkbox_on.xpm"
 #include "pixmaps/clip.xpm"
+#include "pixmaps/clipkey.xpm"
 #include "pixmaps/complete.xpm"
 #include "pixmaps/continue.xpm"
 #include "pixmaps/deleted.xpm"
@@ -41,6 +42,7 @@
 #include "pixmaps/inbox.xpm"
 #include "pixmaps/interface.xpm"
 #include "pixmaps/jpilot.xpm"
+#include "pixmaps/key.xpm"
 #include "pixmaps/ldap.xpm"
 #include "pixmaps/linewrap.xpm"
 #include "pixmaps/mark.xpm"
@@ -90,6 +92,7 @@ static StockPixmapData pixmaps[] =
        {checkbox_off_xpm               , NULL, NULL},
        {checkbox_on_xpm                , NULL, NULL},
        {clip_xpm                       , NULL, NULL},
+       {clipkey_xpm                    , NULL, NULL},
        {complete_xpm                   , NULL, NULL},
        {continue_xpm                   , NULL, NULL},
        {deleted_xpm                    , NULL, NULL},
@@ -101,6 +104,7 @@ static StockPixmapData pixmaps[] =
        {inbox_xpm                      , NULL, NULL},
        {interface_xpm                  , NULL, NULL},
        {jpilot_xpm                     , NULL, NULL},
+       {key_xpm                        , NULL, NULL},
        {ldap_xpm                       , NULL, NULL},
        {linewrap_xpm                   , NULL, NULL},
        {mark_xpm                       , NULL, NULL},

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 0fbbc31aa72e3adabfeac7257cae8144ccbb68b8..ed8b06bdbc1d99a3c2a616ffb1830e242aa76e6d 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -31,6 +31,7 @@ typedef enum
        STOCK_PIXMAP_CHECKBOX_OFF,
        STOCK_PIXMAP_CHECKBOX_ON,
        STOCK_PIXMAP_CLIP,
+       STOCK_PIXMAP_CLIP_KEY,
        STOCK_PIXMAP_COMPLETE,
        STOCK_PIXMAP_CONTINUE,
        STOCK_PIXMAP_DELETED,
@@ -42,6 +43,7 @@ typedef enum
        STOCK_PIXMAP_INBOX,
        STOCK_PIXMAP_INTERFACE,
        STOCK_PIXMAP_JPILOT,
+       STOCK_PIXMAP_KEY,
        STOCK_PIXMAP_LDAP,
        STOCK_PIXMAP_LINEWRAP,
        STOCK_PIXMAP_MARK,

diff --git a/src/summaryview.c b/src/summaryview.c
index 8cb9ab359d0659b1b2b0d26ee34149069caaae13..367b0029cf71dfb33ebdb569e6fbfdec49ecd866 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -100,7 +100,7 @@
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_UNREAD_WIDTH       13
 #define SUMMARY_COL_LOCKED_WIDTH       13
-#define SUMMARY_COL_MIME_WIDTH         10
+#define SUMMARY_COL_MIME_WIDTH         11
 
 static GdkFont *boldfont;
 static GdkFont *smallfont;
@@ -132,6 +132,10 @@ static GdkBitmap *lockedxpmmask;
 
 static GdkPixmap *clipxpm;
 static GdkBitmap *clipxpmmask;
+static GdkPixmap *keyxpm;
+static GdkBitmap *keyxpmmask;
+static GdkPixmap *clipkeyxpm;
+static GdkBitmap *clipkeyxpmmask;
 
 static void summary_free_msginfo_func  (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
@@ -544,6 +548,10 @@ void summary_init(SummaryView *summaryview)
                         &lockedxpm, &lockedxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD,
                         &ignorethreadxpm, &ignorethreadxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY,
+                        &clipkeyxpm, &clipkeyxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
+                        &keyxpm, &keyxpmmask);
 
        if (!small_style) {
                small_style = gtk_style_copy
@@ -2262,6 +2270,7 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
+       MsgFlags flags;
        gchar *filename;
 
        if (!new_window && summaryview->displayed == row) return;
@@ -2296,6 +2305,8 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                summary_status_show(summaryview);
        }
 
+       flags = msginfo->flags;
+
        if (new_window) {
                MessageView *msgview;
 
@@ -2318,7 +2329,8 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                gtkut_ctree_node_move_if_on_the_edge(ctree, row);
        }
 
-       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+       if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags) ||
+           (MSG_IS_MIME(msginfo->flags) - MSG_IS_MIME(flags) != 0)) {
                MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
                CHANGE_FLAGS(msginfo);
                summary_set_row_marks(summaryview, row);
@@ -2575,7 +2587,13 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
        }
 
-       if (MSG_IS_MIME(flags)) {
+       if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+                                         clipkeyxpm, clipkeyxpmmask);
+       } else if (MSG_IS_ENCRYPTED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+                                         keyxpm, keyxpmmask);
+       } else if (MSG_IS_MIME(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipxpm, clipxpmmask);
        } else {