aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-tcp-stream-raw.c2
-rw-r--r--camel/providers/imap/camel-imap-provider.c2
3 files changed, 7 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index e10d1fb943..eb3651936c 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-27 Jeffrey Stedfast <fejj@ximian.com>
+
+ * providers/imap/camel-imap-provider.c: s/IMAPv4/IMAP
+
2001-08-27 Not Zed <NotZed@Ximian.com>
* camel-mime-part-utils.c (convert_buffer): re-read the iconv man
@@ -17,7 +21,7 @@
2001-08-25 Not Zed <NotZed@Ximian.com>
- ["Summarising" and "Synchronising" are spelt with a "s" in
+ ["Summarising" and "Synchronising" are spelt with a "s" in
ENGLISH]
* providers/local/camel-mbox-summary.c (mbox_summary_sync_quick):
diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c
index 8e74f7c433..c269165411 100644
--- a/camel/camel-tcp-stream-raw.c
+++ b/camel/camel-tcp-stream-raw.c
@@ -176,7 +176,7 @@ stream_write (CamelStream *stream, const char *buffer, size_t n)
if (camel_operation_cancel_check (NULL)) {
errno = EINTR;
- return -1;
+ return -1;
}
cancel_fd = camel_operation_cancel_fd (NULL);
diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c
index 35163cdf8d..d3448a0156 100644
--- a/camel/providers/imap/camel-imap-provider.c
+++ b/camel/providers/imap/camel-imap-provider.c
@@ -60,7 +60,7 @@ CamelProviderConfEntry imap_conf_entries[] = {
static CamelProvider imap_provider = {
"imap",
- N_("IMAPv4"),
+ N_("IMAP"),
N_("For reading and storing mail on IMAP servers."),