2010-02-03 [colin] 3.7.5cvs4

[claws.git] / src / privacy.c

diff --git a/src/privacy.c b/src/privacy.c
index 3b9a14498ebd45886d6be69a75d29dc27fa4afb3..98db19436881737820d4b40048a8cab3196bb390 100644 (file)
--- a/src/privacy.c
+++ b/src/privacy.c
@@ -100,7 +100,7 @@ void privacy_free_privacydata(PrivacyData *privacydata)
 {
        PrivacySystem *system = NULL;
        
-       g_return_if_fail(privacydata != NULL);
+       cm_return_if_fail(privacydata != NULL);
 
        system = privacy_data_get_system(privacydata);
        if (!system)
@@ -120,7 +120,7 @@ void privacy_free_privacydata(PrivacyData *privacydata)
 gboolean privacy_mimeinfo_is_signed(MimeInfo *mimeinfo)
 {
        GSList *cur;
-       g_return_val_if_fail(mimeinfo != NULL, FALSE);
+       cm_return_val_if_fail(mimeinfo != NULL, FALSE);
 
        if (mimeinfo->privacy != NULL) {
                PrivacySystem *system = 
@@ -177,7 +177,8 @@ void privacy_msginfo_get_signed_state(MsgInfo *msginfo, gchar **system)
 {
        struct SignedState sstate;
        MimeInfo *mimeinfo = procmime_scan_message(msginfo);
-
+       if (!mimeinfo)
+               return;
        sstate.msginfo = msginfo;
        sstate.system = system;
        g_node_children_foreach(mimeinfo->node, G_TRAVERSE_ALL, msginfo_set_signed_flag, &sstate);
@@ -195,7 +196,7 @@ gint privacy_mimeinfo_check_signature(MimeInfo *mimeinfo)
 {
        PrivacySystem *system;
 
-       g_return_val_if_fail(mimeinfo != NULL, -1);
+       cm_return_val_if_fail(mimeinfo != NULL, -1);
 
        if (mimeinfo->privacy == NULL)
                privacy_mimeinfo_is_signed(mimeinfo);
@@ -217,7 +218,7 @@ SignatureStatus privacy_mimeinfo_get_sig_status(MimeInfo *mimeinfo)
 {
        PrivacySystem *system;
 
-       g_return_val_if_fail(mimeinfo != NULL, -1);
+       cm_return_val_if_fail(mimeinfo != NULL, -1);
 
        if (mimeinfo->privacy == NULL)
                privacy_mimeinfo_is_signed(mimeinfo);
@@ -238,7 +239,7 @@ gchar *privacy_mimeinfo_sig_info_short(MimeInfo *mimeinfo)
 {
        PrivacySystem *system;
 
-       g_return_val_if_fail(mimeinfo != NULL, NULL);
+       cm_return_val_if_fail(mimeinfo != NULL, NULL);
 
        if (mimeinfo->privacy == NULL)
                privacy_mimeinfo_is_signed(mimeinfo);
@@ -259,7 +260,7 @@ gchar *privacy_mimeinfo_sig_info_full(MimeInfo *mimeinfo)
 {
        PrivacySystem *system;
 
-       g_return_val_if_fail(mimeinfo != NULL, NULL);
+       cm_return_val_if_fail(mimeinfo != NULL, NULL);
 
        if (mimeinfo->privacy == NULL)
                privacy_mimeinfo_is_signed(mimeinfo);
@@ -279,7 +280,7 @@ gchar *privacy_mimeinfo_sig_info_full(MimeInfo *mimeinfo)
 gboolean privacy_mimeinfo_is_encrypted(MimeInfo *mimeinfo)
 {
        GSList *cur;
-       g_return_val_if_fail(mimeinfo != NULL, FALSE);
+       cm_return_val_if_fail(mimeinfo != NULL, FALSE);
 
        for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
                PrivacySystem *system = (PrivacySystem *) cur->data;
@@ -296,7 +297,7 @@ static gint decrypt(MimeInfo *mimeinfo, PrivacySystem *system)
        MimeInfo *decryptedinfo, *parentinfo;
        gint childnumber;
        
-       g_return_val_if_fail(system->decrypt != NULL, -1);
+       cm_return_val_if_fail(system->decrypt != NULL, -1);
        
        decryptedinfo = system->decrypt(mimeinfo);
        if (decryptedinfo == NULL)
@@ -315,7 +316,9 @@ static gint decrypt(MimeInfo *mimeinfo, PrivacySystem *system)
 gint privacy_mimeinfo_decrypt(MimeInfo *mimeinfo)
 {
        GSList *cur;
-       g_return_val_if_fail(mimeinfo != NULL, FALSE);
+       cm_return_val_if_fail(mimeinfo != NULL, FALSE);
+
+       procmime_decode_content(mimeinfo);
 
        for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
                PrivacySystem *system = (PrivacySystem *) cur->data;
@@ -345,7 +348,7 @@ static PrivacySystem *privacy_get_system(const gchar *id)
 {
        GSList *cur;
 
-       g_return_val_if_fail(id != NULL, NULL);
+       cm_return_val_if_fail(id != NULL, NULL);
 
        for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
                PrivacySystem *system = (PrivacySystem *) cur->data;
@@ -361,7 +364,7 @@ const gchar *privacy_system_get_name(const gchar *id)
 {
        PrivacySystem *system;
 
-       g_return_val_if_fail(id != NULL, NULL);
+       cm_return_val_if_fail(id != NULL, NULL);
 
        system = privacy_get_system(id);
        if (system == NULL)
@@ -374,7 +377,7 @@ gboolean privacy_system_can_sign(const gchar *id)
 {
        PrivacySystem *system;
 
-       g_return_val_if_fail(id != NULL, FALSE);
+       cm_return_val_if_fail(id != NULL, FALSE);
 
        system = privacy_get_system(id);
        if (system == NULL)
@@ -387,7 +390,7 @@ gboolean privacy_system_can_encrypt(const gchar *id)
 {
        PrivacySystem *system;
 
-       g_return_val_if_fail(id != NULL, FALSE);
+       cm_return_val_if_fail(id != NULL, FALSE);
 
        system = privacy_get_system(id);
        if (system == NULL)
@@ -400,8 +403,8 @@ gboolean privacy_sign(const gchar *id, MimeInfo *target, PrefsAccount *account,
 {
        PrivacySystem *system;
 
-       g_return_val_if_fail(id != NULL, FALSE);
-       g_return_val_if_fail(target != NULL, FALSE);
+       cm_return_val_if_fail(id != NULL, FALSE);
+       cm_return_val_if_fail(target != NULL, FALSE);
 
        system = privacy_get_system(id);
        if (system == NULL)
@@ -417,9 +420,11 @@ gboolean privacy_sign(const gchar *id, MimeInfo *target, PrefsAccount *account,
 gchar *privacy_get_encrypt_data(const gchar *id, GSList *recp_names)
 {
        PrivacySystem *system;
+       gchar *ret = NULL;
+       GSList *uniq_names = NULL, *cur;
 
-       g_return_val_if_fail(id != NULL, NULL);
-       g_return_val_if_fail(recp_names != NULL, NULL);
+       cm_return_val_if_fail(id != NULL, NULL);
+       cm_return_val_if_fail(recp_names != NULL, NULL);
 
        system = privacy_get_system(id);
        if (system == NULL)
@@ -429,14 +434,22 @@ gchar *privacy_get_encrypt_data(const gchar *id, GSList *recp_names)
        if (system->get_encrypt_data == NULL)
                return NULL;
 
-       return system->get_encrypt_data(recp_names);
+       for (cur = recp_names; cur; cur = cur->next) {
+               if (!g_slist_find_custom(uniq_names, cur->data, (GCompareFunc)strcmp)) {
+                       uniq_names = g_slist_prepend(uniq_names, cur->data);
+               }
+       }
+       ret = system->get_encrypt_data(uniq_names);
+       
+       g_slist_free(uniq_names);
+       return ret;
 }
 
 const gchar *privacy_get_encrypt_warning(const gchar *id)
 {
        PrivacySystem *system;
 
-       g_return_val_if_fail(id != NULL, NULL);
+       cm_return_val_if_fail(id != NULL, NULL);
 
        system = privacy_get_system(id);
        if (system == NULL)
@@ -453,7 +466,7 @@ void privacy_inhibit_encrypt_warning(const gchar *id, gboolean inhibit)
 {
        PrivacySystem *system;
 
-       g_return_if_fail(id != NULL);
+       cm_return_if_fail(id != NULL);
 
        system = privacy_get_system(id);
        if (system == NULL)
@@ -470,8 +483,8 @@ gboolean privacy_encrypt(const gchar *id, MimeInfo *mimeinfo, const gchar *encda
 {
        PrivacySystem *system;
 
-       g_return_val_if_fail(id != NULL, FALSE);
-       g_return_val_if_fail(mimeinfo != NULL, FALSE);
+       cm_return_val_if_fail(id != NULL, FALSE);
+       cm_return_val_if_fail(mimeinfo != NULL, FALSE);
        if (encdata == NULL) {
                privacy_set_error(_("No recipient keys defined."));
                return FALSE;