indicate GnuPG signed messages by displaying an icon in the Attachment column

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7f2f74f4c44529d6975914828365d6472a2b1cbb..dea3d345b53293ebc38c356f912583db75fdb045 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2003-01-31 [paul]      0.8.9claws29
+
+       * src/pixmaps/gpg_signed.xpm    ** NEW FILE **
+         src/procheader.c
+         src/stock_pixmap.[ch]
+         src/summaryview.c
+               indicate GnuPG signed messages by displaying an icon
+               in the Attachment column.
+

 2003-01-31 [paul]      0.8.9claws28
 
        * sync with 0.8.9cvs4
 2003-01-31 [paul]      0.8.9claws28
 
        * sync with 0.8.9cvs4

diff --git a/configure.ac b/configure.ac
index aa26ecc72b721d8f23e2f9a8ce5e02e296e3ca3a..b6044312a43544881d4cf96f6dd28f2f3b2b809e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws28
+EXTRA_VERSION=claws29

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/procheader.c b/src/procheader.c
index 207d8dea4bfa8bf4a97d9520cf0619304f4a2aa7..514ff56e2ec12bfe527ff092c2c3f8070fc7269d 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -635,7 +635,11 @@ MsgInfo *procheader_parse_stream(FILE *fp, MsgFlags flags, gboolean full,
                        else if (!strncasecmp(hp, "multipart/encrypted", 19)) {
                                MSG_SET_TMP_FLAGS(msginfo->flags,
                                                  MSG_ENCRYPTED);
                        else if (!strncasecmp(hp, "multipart/encrypted", 19)) {
                                MSG_SET_TMP_FLAGS(msginfo->flags,
                                                  MSG_ENCRYPTED);

-                       }
+                       } 
+                       else if (!strncasecmp(hp, "multipart", 9) &&
+                                  !strncasecmp(hp, "multipart/signed", 16)) {
+                               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_SIGNED);
+                       } 

                        else if (!strncasecmp(hp, "multipart", 9))
                                MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MIME);
                        break;
                        else if (!strncasecmp(hp, "multipart", 9))
                                MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MIME);
                        break;

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index afb97568e1b388d082437ef6cf0f0301ed5cc1de..42429d2f0a474daf62c50dff63ff7367facb1b34 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -90,6 +90,7 @@
 #include "pixmaps/notice_error.xpm"
 #include "pixmaps/notice_note.xpm"
 #include "pixmaps/quicksearch.xpm"
 #include "pixmaps/notice_error.xpm"
 #include "pixmaps/notice_note.xpm"
 #include "pixmaps/quicksearch.xpm"

+#include "pixmaps/gpg_signed.xpm"

 
 typedef struct _StockPixmapData        StockPixmapData;
 
 
 typedef struct _StockPixmapData        StockPixmapData;
 


@@ -181,6 +182,7 @@ static StockPixmapData pixmaps[] =
        {notice_error_xpm                       , NULL, NULL, "notice_error",  "  "},
        {notice_note_xpm                        , NULL, NULL, "notice_note",  "  "},
        {quicksearch_xpm                        , NULL, NULL, "quicksearch",  "  "},
        {notice_error_xpm                       , NULL, NULL, "notice_error",  "  "},
        {notice_note_xpm                        , NULL, NULL, "notice_note",  "  "},
        {quicksearch_xpm                        , NULL, NULL, "quicksearch",  "  "},

+       {gpg_signed_xpm                         , NULL, NULL, "gpg_signed", "  "},

        {sylpheed_logo_xpm                      , NULL, NULL, "sylpheed_logo", "  "},
 };
 
        {sylpheed_logo_xpm                      , NULL, NULL, "sylpheed_logo", "  "},
 };
 

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index ba4ed1834df8b78336c182c30fa419ef6f0bb292..36bac455d7c3a24213838170778cdf32c1eb95a1 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -99,6 +99,7 @@ typedef enum
        STOCK_PIXMAP_NOTICE_ERROR,              /* small error   */
        STOCK_PIXMAP_NOTICE_NOTE,               /* small message */
        STOCK_PIXMAP_QUICKSEARCH,               /* quicksearch pixmap */
        STOCK_PIXMAP_NOTICE_ERROR,              /* small error   */
        STOCK_PIXMAP_NOTICE_NOTE,               /* small message */
        STOCK_PIXMAP_QUICKSEARCH,               /* quicksearch pixmap */

+       STOCK_PIXMAP_GPG_SIGNED,

 
        STOCK_PIXMAP_SYLPHEED_LOGO,             /* last entry */
        
 
        STOCK_PIXMAP_SYLPHEED_LOGO,             /* last entry */
        

diff --git a/src/summaryview.c b/src/summaryview.c
index 96aaa910e14d9530387b46b34921213e2f49c376..98e6339fcd0b312248bce179a8a6519f94b72520 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -128,6 +128,8 @@ static GdkPixmap *keyxpm;
 static GdkBitmap *keyxpmmask;
 static GdkPixmap *clipkeyxpm;
 static GdkBitmap *clipkeyxpmmask;
 static GdkBitmap *keyxpmmask;
 static GdkPixmap *clipkeyxpm;
 static GdkBitmap *clipkeyxpmmask;

+static GdkPixmap *gpgsignedxpm;
+static GdkBitmap *gpgsignedxpmmask;

 
 static void summary_free_msginfo_func  (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,
 
 static void summary_free_msginfo_func  (GtkCTree               *ctree,
                                         GtkCTreeNode           *node,


@@ -741,6 +743,8 @@ void summary_init(SummaryView *summaryview)
                         &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
                         &keyxpm, &keyxpmmask);
                         &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
                         &keyxpm, &keyxpmmask);

+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
+                        &gpgsignedxpm, &gpgsignedxpmmask);

 
        if (!small_style) {
                small_style = gtk_style_copy
 
        if (!small_style) {
                small_style = gtk_style_copy


@@ -2728,7 +2732,10 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
        }
 
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
        }
 

-       if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+       if (MSG_IS_SIGNED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+                                         gpgsignedxpm, gpgsignedxpmmask);
+       } else 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],
                                          clipkeyxpm, clipkeyxpmmask);
        } else if (MSG_IS_ENCRYPTED(flags)) {


@@ -5322,6 +5329,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm, &ignorethreadxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm, &clipkeyxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm, &keyxpmmask);

+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask);

 
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
 
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);