indicate missing keys and expired sigs/keys in mime view column
authorPaul Mangan <paul@claws-mail.org>
Wed, 23 Jul 2003 08:46:58 +0000 (08:46 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 23 Jul 2003 08:46:58 +0000 (08:46 +0000)
ChangeLog.claws
configure.ac
src/Makefile.am
src/mimeview.c
src/pixmaps/mime_gpg_expired.xpm [new file with mode: 0644]
src/pixmaps/mime_gpg_unknown.xpm [new file with mode: 0644]
src/procmime.h
src/rfc2015.c
src/stock_pixmap.c
src/stock_pixmap.h

index b27254c..2c5b6f8 100644 (file)
@@ -1,3 +1,15 @@
+2003-07-23 [paul]      0.9.3claws43
+
+       * src/pixmaps/mime_gpg_expired.xpm      ** NEW FILE **
+         src/pixmaps/mime_gpg_unknown.xpm      ** NEW FILE **
+         src/Makefile.am
+         src/mimeview.c
+         src/procmime.h
+         src/rfc2015.c
+         src/stock_pixmap.[ch]
+               indicate missing keys and expired sigs/keys
+               in mime view column
+
 2003-07-23 [paul]      0.9.3claws42
 
        * src/compose.c
 2003-07-23 [paul]      0.9.3claws42
 
        * src/compose.c
index 06a700b..6f790a6 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws${EXTRA_VERSION}
 
 dnl set $target
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws${EXTRA_VERSION}
 
 dnl set $target
index 542beb7..aedf700 100644 (file)
@@ -176,9 +176,11 @@ EXTRA_DIST = \
        pixmaps/mime_application_octect_stream.xpm \
        pixmaps/mime_application.xpm \
        pixmaps/mime_audio.xpm \
        pixmaps/mime_application_octect_stream.xpm \
        pixmaps/mime_application.xpm \
        pixmaps/mime_audio.xpm \
+       pixmaps/mime_gpg_expired.xpm \
        pixmaps/mime_gpg_failed.xpm \
        pixmaps/mime_gpg_passed.xpm \
        pixmaps/mime_gpg_signed.xpm \
        pixmaps/mime_gpg_failed.xpm \
        pixmaps/mime_gpg_passed.xpm \
        pixmaps/mime_gpg_signed.xpm \
+       pixmaps/mime_gpg_unknown.xpm \
        pixmaps/mime_image.xpm \
        pixmaps/mime_text_enriched.xpm \
        pixmaps/mime_text_html.xpm \
        pixmaps/mime_image.xpm \
        pixmaps/mime_text_enriched.xpm \
        pixmaps/mime_text_html.xpm \
index d7972bc..3aed210 100644 (file)
@@ -1344,6 +1344,11 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                                desc = mimeinfo->sigstatus;
                                if (mimeinfo->sig_ok)
                                        stockp = STOCK_PIXMAP_MIME_GPG_PASSED;
                                desc = mimeinfo->sigstatus;
                                if (mimeinfo->sig_ok)
                                        stockp = STOCK_PIXMAP_MIME_GPG_PASSED;
+                               else if (mimeinfo->sig_unknown) 
+                                       stockp = STOCK_PIXMAP_MIME_GPG_UNKNOWN;
+                               else if (mimeinfo->sig_expired 
+                                        || mimeinfo->key_expired) 
+                                       stockp = STOCK_PIXMAP_MIME_GPG_EXPIRED;
                                else
                                        stockp = STOCK_PIXMAP_MIME_GPG_FAILED;
                        } else
                                else
                                        stockp = STOCK_PIXMAP_MIME_GPG_FAILED;
                        } else
diff --git a/src/pixmaps/mime_gpg_expired.xpm b/src/pixmaps/mime_gpg_expired.xpm
new file mode 100644 (file)
index 0000000..0cc45e6
--- /dev/null
@@ -0,0 +1,52 @@
+/* XPM */
+static char * mime_gpg_expired_xpm[] = {
+"16 18 31 1",
+"      c None",
+".     c #8E8E8E",
+"+     c #FFFFFF",
+"@     c #D39C0A",
+"#     c #E4AB0B",
+"$     c #DA7D25",
+"%     c #E4B600",
+"&     c #E96B00",
+"*     c #7C7C7C",
+"=     c #E9AD00",
+"-     c #E94500",
+";     c #000000",
+">     c #E7BC01",
+",     c #E99400",
+"'     c #E02F00",
+")     c #E9BD00",
+"!     c #E97800",
+"~     c #CA2B04",
+"{     c #E7C50E",
+"]     c #E9B802",
+"^     c #E55902",
+"/     c #E9CE07",
+"(     c #E9AB06",
+"_     c #D64707",
+":     c #E9CF16",
+"<     c #E69E0E",
+"[     c #C86B37",
+"}     c #999999",
+"|     c #E6CF8D",
+"1     c #C47535",
+"2     c #853823",
+"..............  ",
+".++++++++++++.  ",
+".++++++++++++.  ",
+".++++++++++++.  ",
+".++++++++++++.  ",
+".++++++++++++.  ",
+".+++@#$++++++.  ",
+".+++%&*+++**+.  ",
+".+++=-**+***;.  ",
+".++>,'+****;;.  ",
+".++)!~++**;;+.  ",
+".+{]^++****++.  ",
+".+/(_++*****+.  ",
+".+:<[+**;;**}.  ",
+".+|1++*;;++*;}  ",
+".+2++++;++++;.  ",
+".++++++++++++.  ",
+"..............  "};
diff --git a/src/pixmaps/mime_gpg_unknown.xpm b/src/pixmaps/mime_gpg_unknown.xpm
new file mode 100644 (file)
index 0000000..08058ee
--- /dev/null
@@ -0,0 +1,56 @@
+/* XPM */
+static char * mime_gpg_unknown_xpm[] = {
+"14 18 35 1",
+"      c None",
+".     c #8E8E8E",
+"+     c #FFFFFF",
+"@     c #D39C0A",
+"#     c #E4AB0B",
+"$     c #DA7D25",
+"%     c #AAAAAA",
+"&     c #E4B600",
+"*     c #E96B00",
+"=     c #000000",
+"-     c #1D1D1D",
+";     c #555555",
+">     c #727272",
+",     c #E9AD00",
+"'     c #E94500",
+")     c #C7C7C7",
+"!     c #E7BC01",
+"~     c #E99400",
+"{     c #E02F00",
+"]     c #E9BD00",
+"^     c #E97800",
+"/     c #CA2B04",
+"(     c #E7C50E",
+"_     c #E9B802",
+":     c #E55902",
+"<     c #393939",
+"[     c #E9CE07",
+"}     c #E9AB06",
+"|     c #D64707",
+"1     c #E9CF16",
+"2     c #E69E0E",
+"3     c #C86B37",
+"4     c #E6CF8D",
+"5     c #C47535",
+"6     c #853823",
+"..............",
+".++++++++++++.",
+".++++++++++++.",
+".++++++++++++.",
+".++++++++++++.",
+".++++++++++++.",
+".+++@#$%%%%++.",
+".+++&*=-;;==>.",
+".+++,'=)++%==.",
+".++!~{%+++.==.",
+".++]^/+++)--).",
+".+(_:+++.=<++.",
+".+[}|++.=.+++.",
+".+123++==%+++.",
+".+45+++++++++.",
+".+6++++;;)+++.",
+".++++++==%+++.",
+".............."};
index 2363b1e..c757f7e 100644 (file)
@@ -119,6 +119,9 @@ struct _MimeInfo
        gchar *sigstatus;
        gchar *sigstatus_full;
        gboolean sig_ok;
        gchar *sigstatus;
        gchar *sigstatus_full;
        gboolean sig_ok;
+       gboolean sig_unknown;
+       gboolean sig_expired;
+       gboolean key_expired;
 #endif
 
        gint level;
 #endif
 
        gint level;
index 8c5b5f0..4c2cc42 100644 (file)
@@ -412,6 +412,9 @@ leave:
     g_free (partinfo->sigstatus);
     partinfo->sigstatus = g_strdup (result);
     partinfo->sig_ok = (status == GPGME_SIG_STAT_GOOD);
     g_free (partinfo->sigstatus);
     partinfo->sigstatus = g_strdup (result);
     partinfo->sig_ok = (status == GPGME_SIG_STAT_GOOD);
+    partinfo->sig_unknown = (status == GPGME_SIG_STAT_NOKEY);
+    partinfo->sig_expired = (status == GPGME_SIG_STAT_GOOD_EXP);
+    partinfo->key_expired = (status == GPGME_SIG_STAT_GOOD_EXPKEY);
 
     gpgme_data_release (sig);
     gpgme_data_release (text);
 
     gpgme_data_release (sig);
     gpgme_data_release (text);
index 82f362e..6f5c888 100644 (file)
 #include "pixmaps/mime_unknown.xpm"
 #include "pixmaps/mime_gpg_signed.xpm"
 #include "pixmaps/mime_gpg_passed.xpm"
 #include "pixmaps/mime_unknown.xpm"
 #include "pixmaps/mime_gpg_signed.xpm"
 #include "pixmaps/mime_gpg_passed.xpm"
-#include "pixmaps/mime_gpg_failed.xpm"                  
+#include "pixmaps/mime_gpg_failed.xpm"
+#include "pixmaps/mime_gpg_unknown.xpm"
+#include "pixmaps/mime_gpg_expired.xpm"                  
 
 typedef struct _StockPixmapData        StockPixmapData;
 
 
 typedef struct _StockPixmapData        StockPixmapData;
 
@@ -211,6 +213,8 @@ static StockPixmapData pixmaps[] =
        {mime_gpg_signed_xpm                    , NULL, NULL, "mime_gpg_signed", "  "},
        {mime_gpg_passed_xpm                    , NULL, NULL, "mime_gpg_passed", "  "},
        {mime_gpg_failed_xpm                    , NULL, NULL, "mime_gpg_failed", "  "}, 
        {mime_gpg_signed_xpm                    , NULL, NULL, "mime_gpg_signed", "  "},
        {mime_gpg_passed_xpm                    , NULL, NULL, "mime_gpg_passed", "  "},
        {mime_gpg_failed_xpm                    , NULL, NULL, "mime_gpg_failed", "  "}, 
+       {mime_gpg_unknown_xpm                   , NULL, NULL, "mime_gpg_unknown", "  "},
+       {mime_gpg_expired_xpm                   , NULL, NULL, "mime_gpg_expired", "  "},
        {sylpheed_logo_xpm                      , NULL, NULL, "sylpheed_logo", "  "},
 };
 
        {sylpheed_logo_xpm                      , NULL, NULL, "sylpheed_logo", "  "},
 };
 
index 27d0850..7503f8a 100644 (file)
@@ -114,6 +114,8 @@ typedef enum
        STOCK_PIXMAP_MIME_GPG_SIGNED,
        STOCK_PIXMAP_MIME_GPG_PASSED,
        STOCK_PIXMAP_MIME_GPG_FAILED,
        STOCK_PIXMAP_MIME_GPG_SIGNED,
        STOCK_PIXMAP_MIME_GPG_PASSED,
        STOCK_PIXMAP_MIME_GPG_FAILED,
+       STOCK_PIXMAP_MIME_GPG_UNKNOWN,
+       STOCK_PIXMAP_MIME_GPG_EXPIRED,
        
        STOCK_PIXMAP_SYLPHEED_LOGO,             /* last entry */
        
        
        STOCK_PIXMAP_SYLPHEED_LOGO,             /* last entry */