0.9.6claws47

* src/noticeview.c
        don't always display button when noticeview is made visible

* src/mimeview.c
* src/pgpmime.c
* src/privacy.[ch]
* src/sgpgme.[ch]
        get signature information from crypto system

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 30cc34043be1bf26044e6dfc5ddb1ce7a70f2ddf..41342e33b3c1f253a4efb5dff1fb26458c0aa372 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2003-10-23 [christoph] 0.9.6claws47
+
+       * src/noticeview.c
+               don't always display button when noticeview is made visible
+
+       * src/mimeview.c
+       * src/pgpmime.c
+       * src/privacy.[ch]
+       * src/sgpgme.[ch]
+               get signature information from crypto system
+
 2003-10-22 [paul]      0.9.6claws46
 
        * po/es.po

diff --git a/configure.ac b/configure.ac
index d17cd28a9e8543d823a408bf5f37d393c20cd4be..19569bfbc93418b737ab443f5d8a77a2e249bc1e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=47
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/mimeview.c b/src/mimeview.c
index 3dd92ba9cf502150f7085a80ef749fdac38bfeca..cee0b88cc6fd5cf8c4ac30b72e2164daf6248567 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -627,32 +627,29 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
                
                switch (privacy_mimeinfo_get_sig_status(mimeinfo)) {
                case SIGNATURE_UNCHECKED:
-                       text = _("This part of the message has been signed");
                        button_text = _("Check");
                        func = check_signature_cb;
                        icon = STOCK_PIXMAP_PRIVACY_SIGNED;
                        break;
                case SIGNATURE_OK:
-                       text = _("Signature is valid");
                        icon = STOCK_PIXMAP_PRIVACY_PASSED;
                        break;
                case SIGNATURE_WARN:
-                       text = _("Signature is ok");
                        icon = STOCK_PIXMAP_PRIVACY_WARN;
                        break;
                case SIGNATURE_INVALID:
-                       text = _("The signature of this part is invalid");
                        icon = STOCK_PIXMAP_PRIVACY_FAILED;
                        break;
                case SIGNATURE_CHECK_FAILED:
-                       text = _("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,

diff --git a/src/noticeview.c b/src/noticeview.c
index f56486541b29cffff39e19b79322f6ae01e6b2f5..69cb87a10c9eacc05a5bc8f4c12e84a8edc8a661 100644 (file)
--- a/src/noticeview.c
+++ b/src/noticeview.c
@@ -115,7 +115,7 @@ gboolean noticeview_is_visible(NoticeView *noticeview)
 void noticeview_show(NoticeView *noticeview)
 {
        if (!noticeview->visible) {
-               gtk_widget_show_all(GTK_WIDGET_PTR(noticeview));
+               gtk_widget_show(GTK_WIDGET_PTR(noticeview));
                noticeview->visible = TRUE;
        }       
 }

diff --git a/src/pgpmime.c b/src/pgpmime.c
index 8431ace71d290f5961f7b2265011efef11416775..b1c76d02a47b0be4cd49d95cc86729c56d52ef90 100644 (file)
--- a/src/pgpmime.c
+++ b/src/pgpmime.c
@@ -186,6 +186,15 @@ static SignatureStatus pgpmime_get_sig_status(MimeInfo *mimeinfo)
        return sgpgme_sigstat_gpgme_to_privacy(data->sigstatus);
 }
 
+static gchar *pgpmime_get_sig_info_short(MimeInfo *mimeinfo)
+{
+       PrivacyDataPGP *data = (PrivacyDataPGP *) mimeinfo->privacy;
+       
+       g_return_val_if_fail(data != NULL, g_strdup("Error"));
+
+       return sgpgme_sigstat_info_short(data->ctx, data->sigstatus);
+}
+
 static PrivacySystem pgpmime_system = {
        "PGP/Mime",                     /* name */
 
@@ -194,7 +203,7 @@ static PrivacySystem pgpmime_system = {
        pgpmime_is_signed,              /* is_signed(MimeInfo *) */
        pgpmime_check_signature,        /* check_signature(MimeInfo *) */
        pgpmime_get_sig_status,         /* get_sig_status(MimeInfo *) */
-       NULL,                           /* get_sig_info_short(MimeInfo *) */
+       pgpmime_get_sig_info_short,     /* get_sig_info_short(MimeInfo *) */
        NULL,                           /* get_sig_info_full(MimeInfo *) */
 
        /* NOT YET */

diff --git a/src/privacy.c b/src/privacy.c
index 13fbaf894bf854851c0fb281522324d1cc1c3e8a..13059c72255d72fab2347adcecb32467360b8059 100644 (file)
--- a/src/privacy.c
+++ b/src/privacy.c
@@ -19,6 +19,7 @@
 
 #include <glib.h>
 
+#include "intl.h"
 #include "privacy.h"
 #include "procmime.h"
 
@@ -103,6 +104,25 @@ SignatureStatus privacy_mimeinfo_get_sig_status(MimeInfo *mimeinfo)
        return system->get_sig_status(mimeinfo);
 }
 
+gchar *privacy_mimeinfo_sig_info_short(MimeInfo *mimeinfo)
+{
+       PrivacySystem *system;
+
+       g_return_val_if_fail(mimeinfo != NULL, NULL);
+
+       if (mimeinfo->privacy == NULL)
+               privacy_mimeinfo_is_signed(mimeinfo);
+       
+       if (mimeinfo->privacy == NULL)
+               return g_strdup(_("No signature found"));
+       
+       system = mimeinfo->privacy->system;
+       if (system->get_sig_info_short == NULL)
+               return g_strdup(_("No information available"));
+       
+       return system->get_sig_info_short(mimeinfo);
+}
+
 gboolean privacy_mimeinfo_is_encrypted(MimeInfo *mimeinfo)
 {
        g_return_val_if_fail(mimeinfo != NULL, FALSE);

diff --git a/src/privacy.h b/src/privacy.h
index f339f605ad47e6243e9b5c610963c41ab779521c..583665c1d8c10160f2bcaf92840294b72d9e3731 100644 (file)
--- a/src/privacy.h
+++ b/src/privacy.h
@@ -43,6 +43,7 @@ void privacy_free_privacydata                 (PrivacyData *);
 gboolean privacy_mimeinfo_is_signed            (MimeInfo *);
 gint privacy_mimeinfo_check_signature          (MimeInfo *);
 SignatureStatus privacy_mimeinfo_get_sig_status        (MimeInfo *);
+gchar *privacy_mimeinfo_sig_info_short         (MimeInfo *);
 
 #if 0 /* NOT YET */
 gboolean privacy_mimeinfo_is_encrypted         (MimeInfo *);
@@ -57,8 +58,8 @@ struct _PrivacySystem {
        gboolean         (*is_signed)           (MimeInfo *);
        gint             (*check_signature)     (MimeInfo *);
        SignatureStatus  (*get_sig_status)      (MimeInfo *);
-       const gchar     *(*get_sig_info_short)  (MimeInfo *);
-       const gchar     *(*get_sig_info_full)   (MimeInfo *);
+       gchar           *(*get_sig_info_short)  (MimeInfo *);
+       gchar           *(*get_sig_info_full)   (MimeInfo *);
 
        /* NOT YET */
        gboolean         (*is_encrypted)        (MimeInfo *);

diff --git a/src/sgpgme.c b/src/sgpgme.c
index 1863c4c42a29797ff85d70ae4d6e10a5d8b4606a..391f0883bcd4481afba5b85dc8f1752e62facb83 100644 (file)
--- a/src/sgpgme.c
+++ b/src/sgpgme.c
@@ -78,6 +78,67 @@ SignatureStatus sgpgme_sigstat_gpgme_to_privacy(GpgmeSigStat status)
        return SIGNATURE_CHECK_FAILED;
 }
 
+static const gchar *get_validity_str(unsigned long validity)
+{
+       switch (validity) {
+       case GPGME_VALIDITY_UNKNOWN:
+               return _("Unknown");
+       case GPGME_VALIDITY_UNDEFINED:
+               return _("Undefined");
+       case GPGME_VALIDITY_NEVER:
+               return _("Never");
+       case GPGME_VALIDITY_MARGINAL:
+               return _("Marginal");
+       case GPGME_VALIDITY_FULL:
+               return _("Full");
+       case GPGME_VALIDITY_ULTIMATE:
+               return _("Ultimate");
+       default:
+               return _("Error");
+       }
+}
+
+gchar *sgpgme_sigstat_info_short(GpgmeCtx ctx, GpgmeSigStat status)
+{
+       GpgmeKey key;
+
+       switch (status) {
+       case GPGME_SIG_STAT_GOOD:
+       {
+               unsigned long validity = 0, val, i;     
+       
+               if (gpgme_get_sig_key(ctx, 0, &key) != GPGME_No_Error)
+                       return g_strdup(_("Error"));
+               
+               i = 0;
+               while ((val = gpgme_key_get_ulong_attr(key, GPGME_ATTR_VALIDITY, NULL, i++)) > 0)
+                       if (val > validity)
+                               validity = val;
+               
+               return g_strdup_printf(_("Valid signature by %s (Trust: %s)"),
+                       gpgme_key_get_string_attr(key, GPGME_ATTR_USERID, NULL, 0),
+                       get_validity_str(validity));
+       }
+       case GPGME_SIG_STAT_GOOD_EXP:
+               return g_strdup(_("The signature of this part has expired"));
+       case GPGME_SIG_STAT_GOOD_EXPKEY:
+               return g_strdup(_("The key that was used to sign this part has expired"));
+       case GPGME_SIG_STAT_DIFF:
+               return g_strdup(_("Not all signatures are valid"));
+       case GPGME_SIG_STAT_BAD:
+               return g_strdup(_("This signature is invalid"));
+       case GPGME_SIG_STAT_NOKEY:
+               return g_strdup(_("You have no key to verify this signature"));
+       case GPGME_SIG_STAT_NOSIG:
+               return g_strdup(_("Bo signature found"));
+       case GPGME_SIG_STAT_ERROR:
+               return g_strdup(_("An error occured"));
+       case GPGME_SIG_STAT_NONE:
+               return g_strdup(_("The signature of this part has not been checked"));
+       }
+       return g_strdup(_("Error"));
+}
+
 void sgpgme_init()
 {
        if (gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP) != 

diff --git a/src/sgpgme.h b/src/sgpgme.h
index 3be85cd8ac51296d14c71355f20df8d8aa0459e8..37d3dd6712c3d0d96f9649026151fd9599744d7d 100644 (file)
--- a/src/sgpgme.h
+++ b/src/sgpgme.h
@@ -27,9 +27,12 @@
 void sgpgme_init(void);
 void sgpgme_done(void);
 
-GpgmeSigStat sgpgme_verify_signature(GpgmeCtx ctx,
-                                    GpgmeData sig,
-                                    GpgmeData plain);
-SignatureStatus sgpgme_sigstat_gpgme_to_privacy(GpgmeSigStat status);
+GpgmeSigStat sgpgme_verify_signature   (GpgmeCtx ctx,
+                                        GpgmeData sig,
+                                        GpgmeData plain);
+SignatureStatus sgpgme_sigstat_gpgme_to_privacy
+                                       (GpgmeSigStat status);
+gchar *sgpgme_sigstat_info_short       (GpgmeCtx ctx,
+                                        GpgmeSigStat status);
 
 #endif /* SGPGME_H */