0.9.7claws26

* src/messageview.c
* src/privacy.[ch]
        revert pirvacy API changes

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0ebbb73a482c8c2b3862f6506e6a2eeab543f92a..a582ff69d396a88dcc58467e9ef688c69070a6ce 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-12-05 [christoph] 0.9.7claws26
+
+       * src/messageview.c
+       * src/privacy.[ch]
+               revert pirvacy API changes
+
 2003-12-05 [alfons]    0.9.7claws25
 
        * src/matcher.[ch]

diff --git a/configure.ac b/configure.ac
index 9280894d85fa3706ada2a5a7952ef196b38c1274..0677787df867c01949072f1e9236adbed1e3e9df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=26
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/messageview.c b/src/messageview.c
index f70850a3331042feae278230b3ca87d01b0e5812..d0ad10b43994832d7a7f8daf1587dc38749c6902 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -646,8 +646,7 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo,
 {
        gchar *file;
        MimeInfo *mimeinfo, *encinfo;
-       MimeInfo * decrypted;
-       
+
        g_return_if_fail(msginfo != NULL);
 
        mimeinfo = procmime_scan_message(msginfo);
@@ -655,17 +654,10 @@ void messageview_show(MessageView *messageview, MsgInfo *msginfo,
 
        while ((encinfo = find_encrypted_part(mimeinfo)) != NULL) {
                debug_print("decrypting message part\n");
-               decrypted = privacy_mimeinfo_decrypt(encinfo);
-               if (decrypted == NULL) {
-                       break;
-               }
-               else if (procmime_mimeinfo_parent(decrypted) == NULL) {
-                       procmime_mimeinfo_free_all(mimeinfo);
-                       mimeinfo = decrypted;
+               if (privacy_mimeinfo_decrypt(encinfo) < 0)
                        break;
-               }
        }
-
+       
        file = procmsg_get_message_file_path(msginfo);
        if (!file) {
                g_warning("can't get message file path.\n");

diff --git a/src/privacy.c b/src/privacy.c
index 72bdc4d056a7bc4c4ac93c6a602f1b8ad45bd998..76a3cd1628dea01153e3f965d85f3afdbd2274a2 100644 (file)
--- a/src/privacy.c
+++ b/src/privacy.c
@@ -190,33 +190,31 @@ gboolean privacy_mimeinfo_is_encrypted(MimeInfo *mimeinfo)
        return FALSE;
 }
 
-static MimeInfo * decrypt(MimeInfo *mimeinfo, PrivacySystem *system)
+static gint decrypt(MimeInfo *mimeinfo, PrivacySystem *system)
 {
        MimeInfo *decryptedinfo, *parentinfo;
        gint childnumber;
        
-       g_return_val_if_fail(system->decrypt != NULL, NULL);
+       g_return_val_if_fail(system->decrypt != NULL, -1);
        
        decryptedinfo = system->decrypt(mimeinfo);
        if (decryptedinfo == NULL)
-               return NULL;
+               return -1;
 
        parentinfo = procmime_mimeinfo_parent(mimeinfo);
-       if (parentinfo != NULL) {
-               childnumber = g_node_child_index(parentinfo->node, mimeinfo);
-               
-               procmime_mimeinfo_free_all(mimeinfo);
-               
-               g_node_insert(parentinfo->node, childnumber,
-                             decryptedinfo->node);
-       }
-       return decryptedinfo;
+       childnumber = g_node_child_index(parentinfo->node, mimeinfo);
+       
+       procmime_mimeinfo_free_all(mimeinfo);
+
+       g_node_insert(parentinfo->node, childnumber, decryptedinfo->node);
+
+       return 0;
 }
 
-MimeInfo * privacy_mimeinfo_decrypt(MimeInfo *mimeinfo)
+gint privacy_mimeinfo_decrypt(MimeInfo *mimeinfo)
 {
        GSList *cur;
-       g_return_val_if_fail(mimeinfo != NULL, NULL);
+       g_return_val_if_fail(mimeinfo != NULL, FALSE);
 
        for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
                PrivacySystem *system = (PrivacySystem *) cur->data;
@@ -225,5 +223,5 @@ MimeInfo * privacy_mimeinfo_decrypt(MimeInfo *mimeinfo)
                        return decrypt(mimeinfo, system);
        }
 
-       return NULL;
+       return -1;
 }

diff --git a/src/privacy.h b/src/privacy.h
index f04f04e87134365fa10debfefd7a6e4b7bf72dde..53891e9b92e0a6cd1e338028c754f94e056cbeb5 100644 (file)
--- a/src/privacy.h
+++ b/src/privacy.h
@@ -47,7 +47,7 @@ gchar *privacy_mimeinfo_sig_info_short                (MimeInfo *);
 gchar *privacy_mimeinfo_sig_info_full          (MimeInfo *);
 
 gboolean privacy_mimeinfo_is_encrypted         (MimeInfo *);
-MimeInfo * privacy_mimeinfo_decrypt            (MimeInfo *);
+gint privacy_mimeinfo_decrypt                  (MimeInfo *);
 
 struct _PrivacySystem {
        gchar            *name;