From 8ab39ee326666ae0c228e03a765e7bd873114bc8 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Wed, 23 Jul 2003 08:46:58 +0000 Subject: [PATCH] indicate missing keys and expired sigs/keys in mime view column --- ChangeLog.claws | 12 +++++++ configure.ac | 2 +- src/Makefile.am | 2 ++ src/mimeview.c | 5 +++ src/pixmaps/mime_gpg_expired.xpm | 52 +++++++++++++++++++++++++++++ src/pixmaps/mime_gpg_unknown.xpm | 56 ++++++++++++++++++++++++++++++++ src/procmime.h | 3 ++ src/rfc2015.c | 3 ++ src/stock_pixmap.c | 6 +++- src/stock_pixmap.h | 2 ++ 10 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 src/pixmaps/mime_gpg_expired.xpm create mode 100644 src/pixmaps/mime_gpg_unknown.xpm diff --git a/ChangeLog.claws b/ChangeLog.claws index b27254c4b..2c5b6f819 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -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 diff --git a/configure.ac b/configure.ac index 06a700b91..6f790a60e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 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 diff --git a/src/Makefile.am b/src/Makefile.am index 542beb772..aedf70035 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -176,9 +176,11 @@ EXTRA_DIST = \ 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_unknown.xpm \ pixmaps/mime_image.xpm \ pixmaps/mime_text_enriched.xpm \ pixmaps/mime_text_html.xpm \ diff --git a/src/mimeview.c b/src/mimeview.c index d7972bc76..3aed21072 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -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; + 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 diff --git a/src/pixmaps/mime_gpg_expired.xpm b/src/pixmaps/mime_gpg_expired.xpm new file mode 100644 index 000000000..0cc45e66b --- /dev/null +++ b/src/pixmaps/mime_gpg_expired.xpm @@ -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 index 000000000..08058eea1 --- /dev/null +++ b/src/pixmaps/mime_gpg_unknown.xpm @@ -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++++;;)+++.", +".++++++==%+++.", +".............."}; diff --git a/src/procmime.h b/src/procmime.h index 2363b1e29..c757f7eed 100644 --- a/src/procmime.h +++ b/src/procmime.h @@ -119,6 +119,9 @@ struct _MimeInfo gchar *sigstatus; gchar *sigstatus_full; gboolean sig_ok; + gboolean sig_unknown; + gboolean sig_expired; + gboolean key_expired; #endif gint level; diff --git a/src/rfc2015.c b/src/rfc2015.c index 8c5b5f0f8..4c2cc42a1 100644 --- a/src/rfc2015.c +++ b/src/rfc2015.c @@ -412,6 +412,9 @@ leave: 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); diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c index 82f362e83..6f5c88898 100644 --- a/src/stock_pixmap.c +++ b/src/stock_pixmap.c @@ -104,7 +104,9 @@ #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; @@ -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_unknown_xpm , NULL, NULL, "mime_gpg_unknown", " "}, + {mime_gpg_expired_xpm , NULL, NULL, "mime_gpg_expired", " "}, {sylpheed_logo_xpm , NULL, NULL, "sylpheed_logo", " "}, }; diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h index 27d0850b0..7503f8a9a 100644 --- a/src/stock_pixmap.h +++ b/src/stock_pixmap.h @@ -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_UNKNOWN, + STOCK_PIXMAP_MIME_GPG_EXPIRED, STOCK_PIXMAP_SYLPHEED_LOGO, /* last entry */ -- 2.25.1