+2008-05-19 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #531591
+
+ * camel-disco-diary.c:
+ * camel-disco-folder.c:
+ * camel-disco-store.c:
+ * camel-folder-summary.c:
+ * camel-folder.c:
+ * camel-gpg-context.c:
+ * camel-object.c:
+ * camel-offline-journal.c:
+ * camel-provider.c:
+ * camel-sasl-kerberos4.c:
+ * camel-service.c:
+ * camel-session.c:
+ * camel-smime-context.c:
+ * camel-store.c:
+ * camel-url.c:
+ * camel-vee-folder.c:
+ Don't use TeX-style quotes in user-visible messages.
+
2008-05-13 Tor Lillqvist <tml@novell.com>
* camel-net-utils.h [Win32]: Define WIN32_LEAN_AND_MEAN around
if (folder)
g_hash_table_insert (diary->folders, name, folder);
else {
- msg = g_strdup_printf (_("Could not open `%s':\n%s\nChanges made to this folder will not be resynchronized."),
+ msg = g_strdup_printf (_("Could not open '%s':\n%s\nChanges made to this folder will not be resynchronized."),
name, camel_exception_get_description (&ex));
camel_exception_clear (&ex);
camel_session_alert_user (camel_service_get_session (CAMEL_SERVICE (diary->store)),
disco_cache_message (CamelDiscoFolder *disco_folder, const char *uid,
CamelException *ex)
{
- g_warning ("CamelDiscoFolder::cache_message not implemented for `%s'",
+ g_warning ("CamelDiscoFolder::cache_message not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (disco_folder)));
}
static gboolean
can_work_offline (CamelDiscoStore *disco_store)
{
- g_warning ("CamelDiscoStore::can_work_offline not implemented for `%s'",
+ g_warning ("CamelDiscoStore::can_work_offline not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (disco_store)));
return FALSE;
}
error:
if (errno != EINVAL)
- g_warning ("Cannot load summary file: `%s': %s", s->summary_path, g_strerror (errno));
+ g_warning ("Cannot load summary file: '%s': %s", s->summary_path, g_strerror (errno));
CAMEL_SUMMARY_UNLOCK(s, io_lock);
fclose (in);
irt = camel_header_references_inreplyto_decode (camel_header_raw_find (&h, "in-reply-to", NULL));
if (refs || irt) {
if (irt) {
- /* The References field is populated from the ``References'' and/or ``In-Reply-To''
+ /* The References field is populated from the "References" and/or "In-Reply-To"
headers. If both headers exist, take the first thing in the In-Reply-To header
that looks like a Message-ID, and append it to the References header. */
static void
folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
{
- w(g_warning ("CamelFolder::sync not implemented for `%s'",
+ w(g_warning ("CamelFolder::sync not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
}
static void
expunge (CamelFolder *folder, CamelException *ex)
{
- w(g_warning ("CamelFolder::expunge not implemented for `%s'",
+ w(g_warning ("CamelFolder::expunge not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
}
_("Unsupported operation: append message: for %s"),
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
- w(g_warning ("CamelFolder::append_message not implemented for `%s'",
+ w(g_warning ("CamelFolder::append_message not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
return;
static CamelMimeMessage *
get_message (CamelFolder *folder, const char *uid, CamelException *ex)
{
- w(g_warning ("CamelFolder::get_message not implemented for `%s'",
+ w(g_warning ("CamelFolder::get_message not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
return NULL;
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
w(g_warning ("CamelFolder::search_by_expression not implemented for "
- "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
+ "'%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
return NULL;
}
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));
w(g_warning ("CamelFolder::search_by_expression not implemented for "
- "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
+ "'%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder))));
return NULL;
}
} else {
next_token ((char *) status, &prompt);
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Unexpected request from GnuPG for `%s'"), prompt);
+ _("Unexpected request from GnuPG for '%s'"), prompt);
g_free (prompt);
return -1;
}
pair = co_find_pair(klass, name);
if (pair) {
- g_warning("camel_object_class_add_event: `%s' is already declared for '%s'",
+ g_warning("camel_object_class_add_event: '%s' is already declared for '%s'",
name, klass->name);
return;
}
if (klass->magic == CAMEL_INTERFACE_MAGIC && prep != NULL) {
- g_warning("camel_object_class_add_event: `%s', CamelInterface '%s' may not have an event prep function - ignored",
+ g_warning("camel_object_class_add_event: '%s', CamelInterface '%s' may not have an event prep function - ignored",
name, klass->name);
prep = NULL;
}
}
}
- g_warning("camel_object_hook_event: trying to hook event `%s' in class `%s' with no defined events.",
+ g_warning("camel_object_hook_event: trying to hook event '%s' in class '%s' with no defined events.",
name, obj->klass->name);
return 0;
g_return_if_fail (id != 0);
if (obj->hooks == NULL) {
- g_warning("camel_object_unhook_event: trying to unhook `%u` from an instance of `%s' with no hooks",
+ g_warning("camel_object_unhook_event: trying to unhook '%u' from an instance of '%s' with no hooks",
id, obj->klass->name);
return;
}
}
camel_object_unget_hooks(obj);
- g_warning("camel_object_unhook_event: cannot find hook id %u in instance of `%s'",
+ g_warning("camel_object_unhook_event: cannot find hook id %u in instance of '%s'",
id, obj->klass->name);
}
g_return_if_fail (func != NULL);
if (obj->hooks == NULL) {
- g_warning("camel_object_unhook_event: trying to unhook `%s` from an instance of `%s' with no hooks",
+ g_warning("camel_object_unhook_event: trying to unhook '%s' from an instance of '%s' with no hooks",
name, obj->klass->name);
return;
}
}
camel_object_unget_hooks(obj);
- g_warning("camel_object_unhook_event: cannot find hook/data pair %p/%p in an instance of `%s' attached to `%s'",
+ g_warning("camel_object_unhook_event: cannot find hook/data pair %p/%p in an instance of '%s' attached to '%s'",
(void *) func, data, obj->klass->name, name);
}
}
}
- g_warning("camel_object_trigger_event: trying to trigger unknown event `%s' in class `%s'",
+ g_warning("camel_object_trigger_event: trying to trigger unknown event '%s' in class '%s'",
name, obj->klass->name);
return;
if ((fd = g_open (journal->filename, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0666)) == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot write offline journal for folder `%s': %s"),
+ _("Cannot write offline journal for folder '%s': %s"),
journal->folder->full_name, g_strerror (errno));
return -1;
}
exception:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot write offline journal for folder `%s': %s"),
+ _("Cannot write offline journal for folder '%s': %s"),
journal->folder->full_name, g_strerror (errno));
fclose (fp);
if (provider == NULL)
camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
- _("No provider available for protocol `%s'"),
+ _("No provider available for protocol '%s'"),
protocol);
fail:
UNLOCK();
* protection mechanisms supported by the server"
*/
if (!(token->data[4] & KERBEROS_V4_PROTECTION_NONE)) {
- g_warning ("Server does not support `no protection' :-(");
+ g_warning ("Server does not support 'no protection' :-(");
goto lose;
}
static char *
get_name (CamelService *service, gboolean brief)
{
- w(g_warning ("CamelService::get_name not implemented for `%s'",
+ w(g_warning ("CamelService::get_name not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (service))));
return g_strdup ("???");
}
provider = camel_provider_get(url->protocol, ex);
if (provider && !provider->object_types[type]) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
- _("No provider available for protocol `%s'"),
+ _("No provider available for protocol '%s'"),
url->protocol);
provider = NULL;
}
for (i=0;i<recipients->len;i++) {
recipient_certs[i] = CERT_FindCertByNicknameOrEmailAddr(p->certdb, recipients->pdata[i]);
if (recipient_certs[i] == NULL) {
- camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot find certificate for `%s'"), recipients->pdata[i]);
+ camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot find certificate for '%s'"), recipients->pdata[i]);
goto fail;
}
}
static CamelFolder *
get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
{
- w(g_warning ("CamelStore::get_folder not implemented for `%s'",
+ w(g_warning ("CamelStore::get_folder not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_INVALID,
folder = camel_object_bag_reserve(store->folders, folder_name);
if (folder && (flags & CAMEL_STORE_FOLDER_EXCL)) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': folder exists"),
+ _("Cannot create folder '%s': folder exists"),
folder_name);
camel_object_bag_abort (store->folders, folder_name);
camel_object_unref (folder);
create_folder (CamelStore *store, const char *parent_name,
const char *folder_name, CamelException *ex)
{
- w(g_warning ("CamelStore::create_folder not implemented for `%s'",
+ w(g_warning ("CamelStore::create_folder not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_INVALID,
static void
delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
{
- w(g_warning ("CamelStore::delete_folder not implemented for `%s'",
+ w(g_warning ("CamelStore::delete_folder not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
}
static void
rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)
{
- w(g_warning ("CamelStore::rename_folder not implemented for `%s'",
+ w(g_warning ("CamelStore::rename_folder not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
}
static CamelFolderInfo *
get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelException *ex)
{
- w(g_warning ("CamelStore::get_folder_info not implemented for `%s'",
+ w(g_warning ("CamelStore::get_folder_info not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
return NULL;
static void
free_folder_info (CamelStore *store, CamelFolderInfo *fi)
{
- w(g_warning ("CamelStore::free_folder_info not implemented for `%s'",
+ w(g_warning ("CamelStore::free_folder_info not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
}
static gboolean
folder_subscribed(CamelStore *store, const char *folder_name)
{
- w(g_warning ("CamelStore::folder_subscribed not implemented for `%s'",
+ w(g_warning ("CamelStore::folder_subscribed not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
return FALSE;
static void
subscribe_folder(CamelStore *store, const char *folder_name, CamelException *ex)
{
- w(g_warning ("CamelStore::subscribe_folder not implemented for `%s'",
+ w(g_warning ("CamelStore::subscribe_folder not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
}
static void
unsubscribe_folder(CamelStore *store, const char *folder_name, CamelException *ex)
{
- w(g_warning ("CamelStore::unsubscribe_folder not implemented for `%s'",
+ w(g_warning ("CamelStore::unsubscribe_folder not implemented for '%s'",
camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store))));
}
if (!url->protocol) {
camel_url_free (url);
camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
- _("Could not parse URL `%s'"),
+ _("Could not parse URL '%s'"),
url_string);
return NULL;
}
char *desc;
camel_object_get(f, NULL, CAMEL_OBJECT_DESCRIPTION, &desc, NULL);
- camel_exception_setv(ex, ex->id, _("Error storing `%s': %s"), desc, ex->desc);
+ camel_exception_setv(ex, ex->id, _("Error storing '%s': %s"), desc, ex->desc);
break;
}
+2008-05-19 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #531591
+
+ * camel-groupwise-utils.c:
+ * camel-groupwise-folder.c
+ * camel-groupwise-store.c:
+ Don't use TeX-style quotes in user-visible messages.
+
2008-05-19 Sankar P <psankar@novell.com>
* camel-groupwise-folder.c: (groupwise_transfer_messages_to):
is_ok = TRUE;
if (!is_ok) {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot append message to folder `%s': %s"),
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot append message to folder '%s': %s"),
folder->full_name, e_gw_connection_get_error_message (status));
return;
}
status = e_gw_connection_add_item (cnc, container_id, id);
g_message ("Adding %s to %s", id, container_id);
if (status != E_GW_CONNECTION_STATUS_OK) {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot append message to folder `%s': %s"),
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot append message to folder '%s': %s"),
folder->full_name, e_gw_connection_get_error_message (status));
if (appended_uid)
char *temp_new = NULL;
if (groupwise_is_system_folder (old_name)) {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Groupwise folder `%s' to `%s'"),
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Groupwise folder '%s' to '%s'"),
old_name, new_name);
return;
}
if (!container_id || e_gw_connection_rename_folder (priv->cnc, container_id , temp_new) != E_GW_CONNECTION_STATUS_OK)
{
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Groupwise folder `%s' to `%s'"),
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot rename Groupwise folder '%s' to '%s'"),
old_name, new_name);
CAMEL_SERVICE_REC_UNLOCK (groupwise_store, connect_lock);
return;
ppath_len++; /* For the separating slash. */
/* Take account of the fact that we need to translate every
- * separator into `subfolders/'.
+ * separator into 'subfolders/'.
*/
p = vpath;
while (1) {
break;
}
- memcpy (dp, p, newp - p + 1); /* `+ 1' to copy the slash too. */
+ memcpy (dp, p, newp - p + 1); /* '+ 1' to copy the slash too. */
dp += newp - p + 1;
memcpy (dp, SUBFOLDER_DIR_NAME, SUBFOLDER_DIR_NAME_LEN);
+2008-05-19 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #531591
+
+ * camel-imap-store.c:
+ * camel-imap-folder.c:
+ Don't use TeX-style quotes in user-visible messages.
+
2008-04-30 Milan Crha <mcrha@redhat.com>
** Fix for bug #274316
/* FIXME: Sankar: What about custom flags ? */
flaglist = imap_create_flag_list (unset ? folder->permanent_flags : info->info.flags & folder->permanent_flags, (CamelMessageInfo *)info, folder->permanent_flags);
- /* Note: to `unset' flags, use -FLAGS.SILENT (<flag list>) */
+ /* Note: to 'unset' flags, use -FLAGS.SILENT (<flag list>) */
response = camel_imap_command (store, folder, &local_ex,
"UID STORE %s %sFLAGS.SILENT %s",
set, unset ? "-" : "", flaglist);
}
} else if (flags & CAMEL_STORE_FOLDER_EXCL) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': folder exists."),
+ _("Cannot create folder '%s': folder exists."),
folder_name);
camel_imap_response_free_without_processing (imap_store, response);
+2008-05-19 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #531591
+
+ * camel-imap4-engine.c:
+ * camel-imap4-folder.c:
+ * camel-imap4-store.c:
+ * camel-imap4-summary.c:
+ Don't use TeX-style quotes in user-visible messages.
+
2008-05-14 Jeffrey Stedfast <fejj@novell.com>
* camel-imap4-folder.c (imap4_getv): Implement support for getting
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 select folder `%s': Invalid mailbox name"),
+ _("Cannot select folder '%s': Invalid mailbox name"),
folder->full_name);
retval = -1;
break;
case CAMEL_IMAP4_RESULT_BAD:
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot select folder `%s': Bad command"),
+ _("Cannot select folder '%s': Bad command"),
folder->full_name);
retval = -1;
break;
/* 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);
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"),
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;
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"),
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;
}
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;
}
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;
}
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++) {
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;
/* 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"),
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"),
src->full_name, dest->full_name);
}
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);
}
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"),
folder_name, ((CamelService *) store)->url->host);
camel_imap4_command_unref (ic);
goto done;
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"));
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:
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;
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;
}
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;
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;
}
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"));
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;
}
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;
}
return NULL;
if (irt) {
- /* The References field is populated from the `References' and/or `In-Reply-To'
+ /* The References field is populated from the 'References' and/or 'In-Reply-To'
headers. If both headers exist, take the first thing in the In-Reply-To header
that looks like a Message-ID, and append it to the References header. */
+2008-05-19 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #531591
+
+ * camel-spool-summary.c:
+ * camel-local-provider.c:
+ * camel-local-store.c:
+ * camel-spool-store.c:
+ * camel-mh-store.c:
+ * camel-mbox-store.c:
+ * camel-maildir-store.c:
+ Don't use TeX-style quotes in user-visible messages.
+
2008-04-04 Milan Crha <mcrha@redhat.com>
** Fix for bug #522433
CAMEL_PROVIDER_CONF_DEFAULT_PATH,
{ CAMEL_PROVIDER_CONF_SECTION_START, "general", NULL, N_("Options") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "dotfolders", NULL,
- N_("_Use the `.folders' folder summary file (exmh)"), "0" },
+ N_("_Use the '.folders' folder summary file (exmh)"), "0" },
{ CAMEL_PROVIDER_CONF_SECTION_END },
{ CAMEL_PROVIDER_CONF_END }
};
str = g_strdup_printf("%s.ev-summary", name);
if (g_unlink(str) == -1 && errno != ENOENT) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder summary file `%s': %s"),
+ _("Could not delete folder summary file '%s': %s"),
str, g_strerror (errno));
g_free(str);
g_free (name);
str = g_strdup_printf("%s.ev-summary-meta", name);
if (g_unlink(str) == -1 && errno != ENOENT) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder summary file `%s': %s"),
+ _("Could not delete folder summary file '%s': %s"),
str, g_strerror (errno));
g_free(str);
g_free (name);
str = g_strdup_printf("%s.ibex", name);
if (camel_text_index_remove(str) == -1 && errno != ENOENT) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder index file `%s': %s"),
+ _("Could not delete folder index file '%s': %s"),
str, g_strerror (errno));
g_free(str);
g_free (name);
if (g_unlink (str) == -1 && errno != ENOENT) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder meta file `%s': %s"),
+ _("Could not delete folder meta file '%s': %s"),
str, g_strerror (errno));
g_free (name);
g_free (str);
|| mkdir(cur, 0700) != 0
|| mkdir(new, 0700) != 0) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': %s"),
+ _("Cannot create folder '%s': %s"),
folder_name, g_strerror(errno));
rmdir(tmp);
rmdir(cur);
/* folder doesn't exist, see if we should create it */
if (errno != ENOENT) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot get folder `%s': %s"),
+ _("Cannot get folder '%s': %s"),
folder_name, g_strerror (errno));
} else if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
- _("Cannot get folder `%s': folder does not exist."),
+ _("Cannot get folder '%s': folder does not exist."),
folder_name);
} else {
if (mkdir(name, 0700) != 0
|| mkdir(cur, 0700) != 0
|| mkdir(new, 0700) != 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': %s"),
+ _("Cannot create folder '%s': %s"),
folder_name, g_strerror (errno));
rmdir(tmp);
rmdir(cur);
|| stat(new, &st) != 0 || !S_ISDIR(st.st_mode)) {
/* folder exists, but not maildir */
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot get folder `%s': not a maildir directory."), name);
+ _("Cannot get folder '%s': not a maildir directory."), name);
} else if (flags & CAMEL_STORE_FOLDER_EXCL) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': folder exists."),
+ _("Cannot create folder '%s': folder exists."),
folder_name);
} else {
folder = camel_maildir_folder_new(store, folder_name, flags, ex);
|| stat(cur, &st) == -1 || !S_ISDIR(st.st_mode)
|| stat(new, &st) == -1 || !S_ISDIR(st.st_mode)) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder `%s': %s"),
+ _("Could not delete folder '%s': %s"),
folder_name, errno ? g_strerror (errno) :
_("not a maildir directory"));
} else {
mkdir(new, 0700);
mkdir(tmp, 0700);
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder `%s': %s"),
+ _("Could not delete folder '%s': %s"),
folder_name, g_strerror (err));
} else {
/* and remove metadata */
if (dir == NULL) {
g_free(name);
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not scan folder `%s': %s"),
+ _("Could not scan folder '%s': %s"),
root, g_strerror(errno));
goto fail;
}
if (errno != ENOENT) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot get folder `%s': %s"),
+ _("Cannot get folder '%s': %s"),
folder_name, g_strerror (errno));
g_free(name);
return NULL;
if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
- _("Cannot get folder `%s': folder does not exist."),
+ _("Cannot get folder '%s': folder does not exist."),
folder_name);
g_free(name);
return NULL;
dirname = g_path_get_dirname(name);
if (g_mkdir_with_parents(dirname, 0777) == -1 && errno != EEXIST) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': %s"),
+ _("Cannot create folder '%s': %s"),
folder_name, g_strerror (errno));
g_free(dirname);
g_free(name);
fd = g_open(name, O_LARGEFILE | O_WRONLY | O_CREAT | O_APPEND | O_BINARY, 0666);
if (fd == -1) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': %s"),
+ _("Cannot create folder '%s': %s"),
folder_name, g_strerror (errno));
g_free(name);
return NULL;
close(fd);
} else if (!S_ISREG(st.st_mode)) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot get folder `%s': not a regular file."),
+ _("Cannot get folder '%s': not a regular file."),
folder_name);
g_free(name);
return NULL;
} else if (flags & CAMEL_STORE_FOLDER_EXCL) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': folder exists."),
+ _("Cannot create folder '%s': folder exists."),
folder_name);
g_free (name);
return NULL;
if (g_rmdir(path) == -1 && errno != ENOENT) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder `%s':\n%s"),
+ _("Could not delete folder '%s':\n%s"),
folder_name, g_strerror(errno));
g_free(path);
g_free(name);
if (g_stat(name, &st) == -1) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder `%s':\n%s"),
+ _("Could not delete folder '%s':\n%s"),
folder_name, g_strerror(errno));
g_free(name);
return;
if (!S_ISREG(st.st_mode)) {
camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
- _("`%s' is not a regular file."), name);
+ _("'%s' is not a regular file."), name);
g_free(name);
return;
}
if (st.st_size != 0) {
camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_NON_EMPTY,
- _("Folder `%s' is not empty. Not deleted."),
+ _("Folder '%s' is not empty. Not deleted."),
folder_name);
g_free(name);
return;
if (g_unlink(name) == -1 && errno != ENOENT) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder `%s':\n%s"),
+ _("Could not delete folder '%s':\n%s"),
name, g_strerror(errno));
g_free(name);
return;
path = camel_local_store_get_meta_path(store, folder_name, ".ev-summary");
if (g_unlink(path) == -1 && errno != ENOENT) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder summary file `%s': %s"),
+ _("Could not delete folder summary file '%s': %s"),
path, g_strerror(errno));
g_free(path);
g_free(name);
path = camel_local_store_get_meta_path(store, folder_name, ".ev-summary-meta");
if (g_unlink(path) == -1 && errno != ENOENT) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder summary file `%s': %s"),
+ _("Could not delete folder summary file '%s': %s"),
path, g_strerror(errno));
g_free(path);
g_free(name);
path = camel_local_store_get_meta_path(store, folder_name, ".ibex");
if (camel_text_index_remove(path) == -1 && errno != ENOENT) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder index file `%s': %s"),
+ _("Could not delete folder index file '%s': %s"),
path, g_strerror(errno));
g_free(path);
g_free(name);
if (g_unlink(path) == -1 && errno != ENOENT) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder meta file `%s': %s"),
+ _("Could not delete folder meta file '%s': %s"),
path, g_strerror(errno));
g_free(path);
dir = g_path_get_dirname(path);
if (g_mkdir_with_parents(dir, 0777) == -1 && errno != EEXIST) {
- camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot create directory `%s': %s."),
+ camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot create directory '%s': %s."),
dir, g_strerror(errno));
g_free(path);
if (g_mkdir_with_parents(newdir, 0777) == -1) {
if (errno != EEXIST) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not rename `%s': `%s': %s"),
+ _("Could not rename '%s': '%s': %s"),
old, new, g_strerror(errno));
g_free(oldibex);
g_free(newibex);
if (stat(name, &st) == -1) {
if (errno != ENOENT) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot get folder `%s': %s"),
+ _("Cannot get folder '%s': %s"),
folder_name, g_strerror (errno));
g_free (name);
return NULL;
}
if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
- _("Cannot get folder `%s': folder does not exist."),
+ _("Cannot get folder '%s': folder does not exist."),
folder_name);
g_free (name);
return NULL;
if (mkdir(name, 0777) != 0) {
camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not create folder `%s': %s"),
+ _("Could not create folder '%s': %s"),
folder_name, g_strerror (errno));
g_free (name);
return NULL;
folders_update(((CamelLocalStore *)store)->toplevel_dir, UPDATE_ADD, folder_name, NULL);
} else if (!S_ISDIR(st.st_mode)) {
camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
- _("Cannot get folder `%s': not a directory."), folder_name);
+ _("Cannot get folder '%s': not a directory."), folder_name);
g_free (name);
return NULL;
} else if (flags & CAMEL_STORE_FOLDER_EXCL) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Cannot create folder `%s': folder exists."), folder_name);
+ _("Cannot create folder '%s': folder exists."), folder_name);
g_free (name);
return NULL;
}
name = g_strdup_printf("%s%s", CAMEL_LOCAL_STORE(store)->toplevel_dir, folder_name);
if (rmdir(name) == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not delete folder `%s': %s"),
+ _("Could not delete folder '%s': %s"),
folder_name, g_strerror (errno));
g_free(name);
return;
if (stat(service->url->path, &st) == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
- _("Spool `%s' cannot be opened: %s"),
+ _("Spool '%s' cannot be opened: %s"),
service->url->path, g_strerror (errno));
return;
}
((CamelSpoolStore *)service)->type = CAMEL_SPOOL_STORE_ELM;
else {
camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
- _("Spool `%s' is not a regular file or directory"),
+ _("Spool '%s' is not a regular file or directory"),
service->url->path);
return;
}
if (((CamelSpoolStore *)store)->type == CAMEL_SPOOL_STORE_MBOX) {
if (strcmp(folder_name, "INBOX") != 0) {
camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
- _("Folder `%s/%s' does not exist."),
+ _("Folder '%s/%s' does not exist."),
((CamelService *)store)->url->path, folder_name);
} else {
folder = camel_spool_folder_new(store, folder_name, flags, ex);
if (stat(name, &st) == -1) {
if (errno != ENOENT) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not open folder `%s':\n%s"),
+ _("Could not open folder '%s':\n%s"),
folder_name, g_strerror (errno));
} else if ((flags & CAMEL_STORE_FOLDER_CREATE) == 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
- _("Folder `%s' does not exist."),
+ _("Folder '%s' does not exist."),
folder_name);
} else {
if (creat (name, 0600) == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not create folder `%s':\n%s"),
+ _("Could not create folder '%s':\n%s"),
folder_name, g_strerror (errno));
} else {
folder = camel_spool_folder_new(store, folder_name, flags, ex);
}
} else if (!S_ISREG(st.st_mode)) {
camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,
- _("`%s' is not a mailbox file."), name);
+ _("'%s' is not a mailbox file."), name);
} else {
folder = camel_spool_folder_new(store, folder_name, flags, ex);
}
if (stat(name, &st) == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not scan folder `%s': %s"),
+ _("Could not scan folder '%s': %s"),
name, g_strerror (errno));
} else if (S_ISREG(st.st_mode)) {
/* incase we start scanning from a file. messy duplication :-/ */
dir = opendir(name);
if (dir == NULL) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Could not scan folder `%s': %s"),
+ _("Could not scan folder '%s': %s"),
name, g_strerror (errno));
return -1;
}
if (size == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Could not sync spool folder %s: %s\n"
- "Folder may be corrupt, copy saved in `%s'"),
+ "Folder may be corrupt, copy saved in '%s'"),
((CamelLocalSummary *)cls)->folder_path,
g_strerror (errno), tmpname);
/* so we dont delete it */
if (ftruncate(fd, outlen) == -1) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Could not sync spool folder %s: %s\n"
- "Folder may be corrupt, copy saved in `%s'"),
+ "Folder may be corrupt, copy saved in '%s'"),
((CamelLocalSummary *)cls)->folder_path,
g_strerror (errno), tmpname);
tmpname[0] = '\0';
g_warning("Cannot close source folder: %s", strerror (errno));
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Could not sync spool folder %s: %s\n"
- "Folder may be corrupt, copy saved in `%s'"),
+ "Folder may be corrupt, copy saved in '%s'"),
((CamelLocalSummary *)cls)->folder_path,
g_strerror (errno), tmpname);
tmpname[0] = '\0';
+2008-05-19 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes part of bug #531591
+
+ * camel-pop3-store.c:
+ Don't use TeX-style quotes in user-visible messages.
+
2008-05-11 Jeffrey Stedfast <fejj@novell.com>
* camel-pop3-stream.c (stream_fill): Use memmove() instead of
break;
if (strncmp((char *) line, "-ERR", 4) == 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
- _("SASL `%s' Login failed for POP server %s: %s"),
+ _("SASL '%s' Login failed for POP server %s: %s"),
mech, CAMEL_SERVICE (store)->url->host, line);
goto done;
}
{
if (g_ascii_strcasecmp (folder_name, "inbox") != 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
- _("No such folder `%s'."), folder_name);
+ _("No such folder '%s'."), folder_name);
return NULL;
}
return camel_pop3_folder_new (store, ex);
continue;
}
- push ("testing message `%s`", filename);
+ push ("testing message '%s'", filename);
g_free (filename);
stream = camel_stream_fs_new_with_fd (fd);
CamelStream *indisk, *outdisk, *filter;
int id;
- camel_test_push("Data file `%s'", inname);
+ camel_test_push("Data file '%s'", inname);
camel_test_push("setup");
projects / platform / upstream / evolution-data-server.git / commitdiff