aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog21
-rw-r--r--camel/camel-smime-context.c2
2 files changed, 6 insertions, 17 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 7f2b12670b..ff58168bc6 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-11 Jeffrey Stedfast <fejj@novell.com>
+
+ * camel-smime-context.c (sm_signing_cmsmessage): Fixed a
+ type-o. Fixes bug #58348.
+
2004-05-10 Jeffrey Stedfast <fejj@novell.com>
* camel-mime-filter-gzip.[c,h]: New class for zipping/unzipping
@@ -15,22 +20,6 @@
* camel-folder-thread.h: make order and re bitfields, saves 4
bytes/node.
-2004-05-06 Not Zed <NotZed@Ximian.com>
-
- * providers/imap/camel-imap-store.c (connect_to_server): set
- nodelay and keepalive on the socket.
-
- * camel-file-utils.c (camel_read): put a timeout on the select.
- Logic shuffle to match the ssl stuff.
- (camel_write): Similar.
-
- * camel-tcp-stream-ssl.c (stream_connect): remove timeout, use
- CONNECT_TIMEOUT directly.
- (stream_read): put a timeout on the poll. IO_TIMEOUT. And a
- little logic shuffle.
- (stream_write): similar.
- (CONNECT_TIMEOUT): make this 4 minutes === tcp-raw timeout.
-
2004-05-05 Not Zed <NotZed@Ximian.com>
* providers/imap/camel-imap-folder.c (get_message_simple): dont
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index 8099453417..e650202aa4 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -351,7 +351,7 @@ sm_signing_cmsmessage(CamelSMIMEContext *context, const char *nick, SECOidTag ha
}
if (ekpcert != NULL && NSS_CMSSignedData_AddCertificate(sigd, ekpcert) != SECSuccess) {
- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot add add encryption certificate"));
+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot add encryption certificate"));
goto fail;
}
}