camel-imap4 r17 - trunk/imap4
- From: fejj svn gnome org
- To: svn-commits-list gnome org
- Subject: camel-imap4 r17 - trunk/imap4
- Date: Sun, 20 Jul 2008 00:56:02 +0000 (UTC)
Author: fejj
Date: Sun Jul 20 00:56:02 2008
New Revision: 17
URL: http://svn.gnome.org/viewvc/camel-imap4?rev=17&view=rev
Log:
2008-07-19 Jeffrey Stedfast <fejj novell com>
* camel-imap4-store.c: s/Unknown/Unknown error/g
* camel-imap4-engine.c: Same.
* camel-imap4-folder.c: Same.
Modified:
trunk/imap4/ChangeLog
trunk/imap4/camel-imap4-engine.c
trunk/imap4/camel-imap4-folder.c
trunk/imap4/camel-imap4-store.c
Modified: trunk/imap4/camel-imap4-engine.c
==============================================================================
--- trunk/imap4/camel-imap4-engine.c (original)
+++ trunk/imap4/camel-imap4-engine.c Sun Jul 20 00:56:02 2008
@@ -1567,7 +1567,7 @@
if (camel_imap4_stream_next_token (engine->istream, token) == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("IMAP4 server %s unexpectedly disconnected: %s"),
- engine->url->host, errno ? g_strerror (errno) : _("Unknown"));
+ engine->url->host, errno ? g_strerror (errno) : _("Unknown error"));
engine->state = CAMEL_IMAP4_ENGINE_DISCONNECTED;
@@ -1606,7 +1606,7 @@
if (retval == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("IMAP4 server %s unexpectedly disconnected: %s"),
- engine->url->host, errno ? g_strerror (errno) : _("Unknown"));
+ engine->url->host, errno ? g_strerror (errno) : _("Unknown error"));
engine->state = CAMEL_IMAP4_ENGINE_DISCONNECTED;
@@ -1651,7 +1651,7 @@
if (retval == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("IMAP4 server %s unexpectedly disconnected: %s"),
- engine->url->host, errno ? g_strerror (errno) : _("Unknown"));
+ engine->url->host, errno ? g_strerror (errno) : _("Unknown error"));
if (linebuf != NULL)
g_byte_array_free (linebuf, TRUE);
@@ -1707,7 +1707,7 @@
if (retval == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("IMAP4 server %s unexpectedly disconnected: %s"),
- engine->url->host, errno ? g_strerror (errno) : _("Unknown"));
+ engine->url->host, errno ? g_strerror (errno) : _("Unknown error"));
if (literalbuf != NULL)
g_byte_array_free (literalbuf, TRUE);
Modified: trunk/imap4/camel-imap4-folder.c
==============================================================================
--- trunk/imap4/camel-imap4-folder.c (original)
+++ trunk/imap4/camel-imap4-folder.c Sun Jul 20 00:56:02 2008
@@ -420,7 +420,7 @@
/* we *do* care if summary loading fails here though */
if (camel_folder_summary_load (folder->summary) == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_PATH,
- _("Cannot access folder `%s': %s"),
+ _("Cannot access folder '%s': %s"),
full_name, g_strerror (ENOENT));
camel_object_unref (folder);
@@ -479,13 +479,13 @@
case CAMEL_IMAP4_RESULT_NO:
/* FIXME: would be good to save the NO reason into the err message */
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot sync flags to folder `%s': Unknown"),
+ _("Cannot sync flags to folder '%s': Unknown error"),
folder->full_name);
retval = -1;
break;
case CAMEL_IMAP4_RESULT_BAD:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot sync flags to folder `%s': Bad command"),
+ _("Cannot sync flags to folder '%s': Bad command"),
folder->full_name);
retval = -1;
break;
@@ -625,12 +625,12 @@
case CAMEL_IMAP4_RESULT_NO:
/* FIXME: would be good to save the NO reason into the err message */
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot expunge folder `%s': Unknown"),
+ _("Cannot expunge folder '%s': Unknown error"),
folder->full_name);
break;
case CAMEL_IMAP4_RESULT_BAD:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot expunge folder `%s': Bad command"),
+ _("Cannot expunge folder '%s': Bad command"),
folder->full_name);
break;
}
@@ -886,12 +886,12 @@
case CAMEL_IMAP4_RESULT_NO:
/* FIXME: would be good to save the NO reason into the err message */
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot get message %s from folder `%s': No such message"),
+ _("Cannot get message %s from folder '%s': No such message"),
uid, folder->full_name);
break;
case CAMEL_IMAP4_RESULT_BAD:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot get message %s from folder `%s': Bad command"),
+ _("Cannot get message %s from folder '%s': Bad command"),
uid, folder->full_name);
break;
}
@@ -935,7 +935,7 @@
if (((CamelIMAP4Folder *) folder)->read_only) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot append message to folder `%s': Folder is read-only"),
+ _("Cannot append message to folder '%s': Folder is read-only"),
folder->full_name);
return;
}
@@ -1028,7 +1028,7 @@
case CAMEL_IMAP4_RESULT_NO:
/* FIXME: can we give the user any more information? */
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot append message to folder `%s': Unknown error"),
+ _("Cannot append message to folder '%s': Unknown error"),
folder->full_name);
for (i = 0; i < ic->resp_codes->len; i++) {
@@ -1058,7 +1058,7 @@
break;
case CAMEL_IMAP4_RESULT_BAD:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot append message to folder `%s': Bad command"),
+ _("Cannot append message to folder '%s': Bad command"),
folder->full_name);
break;
@@ -1178,11 +1178,11 @@
/* FIXME: would be good to save the NO reason into the err message */
if (move) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot move messages from folder `%s' to folder `%s': Unknown"),
+ _("Cannot move messages from folder '%s' to folder '%s': Unknown error"),
src->full_name, dest->full_name);
} else {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot copy messages from folder `%s' to folder `%s': Unknown"),
+ _("Cannot copy messages from folder '%s' to folder '%s': Unknown error"),
src->full_name, dest->full_name);
}
@@ -1190,11 +1190,11 @@
case CAMEL_IMAP4_RESULT_BAD:
if (move) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot move messages from folder `%s' to folder `%s': Bad command"),
+ _("Cannot move messages from folder '%s' to folder '%s': Bad command"),
src->full_name, dest->full_name);
} else {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot copy messages from folder `%s' to folder `%s': Bad command"),
+ _("Cannot copy messages from folder '%s' to folder '%s': Bad command"),
src->full_name, dest->full_name);
}
Modified: trunk/imap4/camel-imap4-store.c
==============================================================================
--- trunk/imap4/camel-imap4-store.c (original)
+++ trunk/imap4/camel-imap4-store.c Sun Jul 20 00:56:02 2008
@@ -737,7 +737,7 @@
if (ic->result != CAMEL_IMAP4_RESULT_OK) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot get folder `%s' on IMAP server %s: Unknown"),
+ _("Cannot get folder '%s' on IMAP server %s: Unknown error"),
folder_name, ((CamelService *) store)->url->host);
camel_imap4_command_unref (ic);
goto done;
@@ -818,9 +818,9 @@
camel_imap4_command_unref (ic);
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot get LIST information for `%s' on IMAP server %s: %s"),
+ _("Cannot get LIST information for '%s' on IMAP server %s: %s"),
folder_name, engine->url->host, ic->result == CAMEL_IMAP4_RESULT_BAD ?
- _("Bad command") : _("Unknown"));
+ _("Bad command") : _("Unknown error"));
for (i = 0; i < array->len; i++) {
list = array->pdata[i];
@@ -899,12 +899,12 @@
case CAMEL_IMAP4_RESULT_NO:
/* FIXME: would be good to save the NO reason into the err message */
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': Invalid mailbox name"),
+ _("Cannot create folder '%s': Invalid mailbox name"),
folder_name);
break;
case CAMEL_IMAP4_RESULT_BAD:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': Bad command"),
+ _("Cannot create folder '%s': Bad command"),
folder_name);
break;
default:
@@ -1010,7 +1010,7 @@
if (!g_ascii_strcasecmp (folder_name, "INBOX")) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot delete folder `%s': Special folder"),
+ _("Cannot delete folder '%s': Special folder"),
folder_name);
return;
@@ -1076,12 +1076,12 @@
case CAMEL_IMAP4_RESULT_NO:
/* FIXME: would be good to save the NO reason into the err message */
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot delete folder `%s': Invalid mailbox name"),
+ _("Cannot delete folder '%s': Invalid mailbox name"),
folder_name);
break;
case CAMEL_IMAP4_RESULT_BAD:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot delete folder `%s': Bad command"),
+ _("Cannot delete folder '%s': Bad command"),
folder_name);
break;
}
@@ -1101,7 +1101,7 @@
if (!g_ascii_strcasecmp (old_name, "INBOX")) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot rename folder `%s' to `%s': Special folder"),
+ _("Cannot rename folder '%s' to '%s': Special folder"),
old_name, new_name);
return;
@@ -1139,12 +1139,12 @@
case CAMEL_IMAP4_RESULT_NO:
/* FIXME: would be good to save the NO reason into the err message */
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot rename folder `%s' to `%s': Invalid mailbox name"),
+ _("Cannot rename folder '%s' to '%s': Invalid mailbox name"),
old_name, new_name);
break;
case CAMEL_IMAP4_RESULT_BAD:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot rename folder `%s' to `%s': Bad command"),
+ _("Cannot rename folder '%s' to '%s': Bad command"),
old_name, new_name);
break;
}
@@ -1572,9 +1572,9 @@
camel_imap4_command_unref (ic);
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot get %s information for pattern `%s' on IMAP server %s: %s"),
+ _("Cannot get %s information for pattern '%s' on IMAP server %s: %s"),
cmd, pattern, engine->url->host, ic->result == CAMEL_IMAP4_RESULT_BAD ?
- _("Bad command") : _("Unknown"));
+ _("Bad command") : _("Unknown error"));
for (i = 0; i < array->len; i++) {
list = array->pdata[i];
@@ -1678,12 +1678,12 @@
case CAMEL_IMAP4_RESULT_NO:
/* FIXME: would be good to save the NO reason into the err message */
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot subscribe to folder `%s': Invalid mailbox name"),
+ _("Cannot subscribe to folder '%s': Invalid mailbox name"),
folder_name);
break;
case CAMEL_IMAP4_RESULT_BAD:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot subscribe to folder `%s': Bad command"),
+ _("Cannot subscribe to folder '%s': Bad command"),
folder_name);
break;
}
@@ -1750,12 +1750,12 @@
case CAMEL_IMAP4_RESULT_NO:
/* FIXME: would be good to save the NO reason into the err message */
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot unsubscribe from folder `%s': Invalid mailbox name"),
+ _("Cannot unsubscribe from folder '%s': Invalid mailbox name"),
folder_name);
break;
case CAMEL_IMAP4_RESULT_BAD:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot unsubscribe from folder `%s': Bad command"),
+ _("Cannot unsubscribe from folder '%s': Bad command"),
folder_name);
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
