2006-06-15 [colin] 2.3.0cvs16

[claws.git] / src / privacy.c

diff --git a/src/privacy.c b/src/privacy.c
index 4849a93b7d1fa7c6851f84edb336ec3e2b8c7cab..4d8ed9385ec57b4c428e9785a4fce978d9d75d6f 100644 (file)
--- a/src/privacy.c
+++ b/src/privacy.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto & the Sylpheed-Claws team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <glib.h>
@@ -24,7 +24,42 @@
 #include "procmime.h"
 
 static GSList *systems = NULL;
+static gchar *privacy_last_error = NULL;
 
+void privacy_set_error(const gchar *format, ...)
+{
+       va_list args;
+       gchar buf[BUFSIZ];
+
+       va_start(args, format);
+       g_vsnprintf(buf, BUFSIZ, format, args);
+       va_end(args);
+       g_free(privacy_last_error);
+       privacy_last_error = g_strdup(buf);
+}
+
+static gchar tmp_privacy_error[BUFSIZ];
+
+const gchar *privacy_get_error (void)
+{
+       if (privacy_last_error) {
+               strncpy2(tmp_privacy_error, privacy_last_error, BUFSIZ-1);
+               g_free(privacy_last_error);
+               privacy_last_error = NULL;
+               return tmp_privacy_error;
+       } else {
+               return _("Unknown error");
+       }
+}
+
+PrivacySystem *privacy_data_get_system(PrivacyData *data)
+{
+       /* Make sure the cached system is still registered */
+       if (data->system && g_slist_find(systems, data->system))
+               return data->system;
+       else
+               return NULL;
+}
 /**
  * Register a new Privacy System
  *
@@ -53,9 +88,14 @@ void privacy_unregister_system(PrivacySystem *system)
  */
 void privacy_free_privacydata(PrivacyData *privacydata)
 {
+       PrivacySystem *system = NULL;
+       
        g_return_if_fail(privacydata != NULL);
 
-       privacydata->system->free_privacydata(privacydata);
+       system = privacy_data_get_system(privacydata);
+       if (!system)
+               return;
+       system->free_privacydata(privacydata);
 }
 
 /**
@@ -73,14 +113,20 @@ gboolean privacy_mimeinfo_is_signed(MimeInfo *mimeinfo)
        g_return_val_if_fail(mimeinfo != NULL, FALSE);
 
        if (mimeinfo->privacy != NULL) {
-               PrivacySystem *system = mimeinfo->privacy->system;
+               PrivacySystem *system = 
+                       privacy_data_get_system(mimeinfo->privacy);
+
+               if (system == NULL) {
+                       mimeinfo->privacy = NULL;
+                       goto try_others;
+               }
 
                if (system->is_signed != NULL)
                        return system->is_signed(mimeinfo);
                else
                        return FALSE;
        }
-
+try_others:
        for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
                PrivacySystem *system = (PrivacySystem *) cur->data;
 
@@ -111,7 +157,10 @@ gint privacy_mimeinfo_check_signature(MimeInfo *mimeinfo)
        if (mimeinfo->privacy == NULL)
                return -1;
        
-       system = mimeinfo->privacy->system;
+       system = privacy_data_get_system(mimeinfo->privacy);
+       if (system == NULL)
+               return -1;
+
        if (system->check_signature == NULL)
                return -1;
        
@@ -130,7 +179,9 @@ SignatureStatus privacy_mimeinfo_get_sig_status(MimeInfo *mimeinfo)
        if (mimeinfo->privacy == NULL)
                return SIGNATURE_UNCHECKED;
        
-       system = mimeinfo->privacy->system;
+       system = privacy_data_get_system(mimeinfo->privacy);
+       if (system == NULL)
+               return SIGNATURE_UNCHECKED;
        if (system->get_sig_status == NULL)
                return SIGNATURE_UNCHECKED;
        
@@ -149,7 +200,9 @@ gchar *privacy_mimeinfo_sig_info_short(MimeInfo *mimeinfo)
        if (mimeinfo->privacy == NULL)
                return g_strdup(_("No signature found"));
        
-       system = mimeinfo->privacy->system;
+       system = privacy_data_get_system(mimeinfo->privacy);
+       if (system == NULL)
+               return g_strdup(_("No signature found"));
        if (system->get_sig_info_short == NULL)
                return g_strdup(_("No information available"));
        
@@ -168,7 +221,9 @@ gchar *privacy_mimeinfo_sig_info_full(MimeInfo *mimeinfo)
        if (mimeinfo->privacy == NULL)
                return g_strdup(_("No signature found"));
        
-       system = mimeinfo->privacy->system;
+       system = privacy_data_get_system(mimeinfo->privacy);
+       if (system == NULL)
+               return g_strdup(_("No signature found"));
        if (system->get_sig_info_full == NULL)
                return g_strdup(_("No information available"));
        
@@ -337,7 +392,10 @@ gboolean privacy_encrypt(const gchar *id, MimeInfo *mimeinfo, const gchar *encda
 
        g_return_val_if_fail(id != NULL, FALSE);
        g_return_val_if_fail(mimeinfo != NULL, FALSE);
-       g_return_val_if_fail(encdata != NULL, FALSE);
+       if (encdata == NULL) {
+               privacy_set_error(_("No recipient keys defined."));
+               return FALSE;
+       }
 
        system = privacy_get_system(id);
        if (system == NULL)