r1132 - /unstable/evolution-data-server/debian/patches/67_detect-change-signed-messages.patch

[corsac at users.alioth.debian.org]

Author: corsac
Date: Sun Mar  8 15:09:03 2009
New Revision: 1132

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1132
Log:
fix patch using functions present in 2.24.5

Modified:
    unstable/evolution-data-server/debian/patches/67_detect-change-signed-messages.patch

Modified: unstable/evolution-data-server/debian/patches/67_detect-change-signed-messages.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/67_detect-change-signed-messages.patch?rev=1132&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/67_detect-change-signed-messages.patch (original)
+++ unstable/evolution-data-server/debian/patches/67_detect-change-signed-messages.patch Sun Mar  8 15:09:03 2009
@@ -59,12 +59,12 @@
 -				PORT_FreeArena(poolp, PR_FALSE);
 -				poolp = NULL;
 +			if (extstream == NULL) {
-+				set_nss_error (ex, _("Digests missing from enveloped data"));
++				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data"));
 +  				goto fail;
 +			}
 +  
 +			if ((poolp = PORT_NewArena(1024)) == NULL) {
-+				set_nss_error (ex, g_strerror (ENOMEM));
++				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM));
 +				goto fail;
  			}
 + 
@@ -72,7 +72,7 @@
 +			
 +			digcx = NSS_CMSDigestContext_StartMultiple(digestalgs);
 +			if (digcx == NULL) {
-+				set_nss_error (ex, _("Cannot calculate digests"));
++				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
 +				goto fail;
 +			}
 +  
@@ -82,18 +82,18 @@
 +			camel_object_unref(mem);
 +  
 +			if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) {
-+				set_nss_error (ex, _("Cannot calculate digests"));
++				camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
 +				goto fail;
 +			}
 +  
 +			for (which_digest = 0; digests[which_digest] != NULL; which_digest++) {
 +				SECOidData *digest_alg = SECOID_FindOID (&digestalgs[which_digest]->algorithm);
 +				if (digest_alg == NULL) {
-+					set_nss_error (ex, _("Cannot set message digests"));
++					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
 +  					goto fail;
 +  				}
 +				if (NSS_CMSSignedData_SetDigestValue (sigd, digest_alg->offset, digests[which_digest]) != SECSuccess) {
-+					set_nss_error (ex, _("Cannot set message digests"));
++					camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
 +					goto fail;
 +  				}
 +  			}