aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog10
-rw-r--r--mail/component-factory.c2
-rw-r--r--mail/folder-browser.c2
-rw-r--r--mail/mail-callbacks.c6
-rw-r--r--mail/mail-local.c7
-rw-r--r--mail/mail-ops.c4
-rw-r--r--mail/mail-tools.c18
7 files changed, 28 insertions, 21 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 41188d71e5..a4228c8784 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,15 @@
+2001-07-17 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-local.c (init_trash): Use CAMEL_VTRASH_NAME.
+
+ * mail-ops.c (add_vtrash_info): Use CAMEL_VTRASH_NAME.
+
+ * folder-browser.c: turned off some debugging
+
2001-07-16 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-callbacks.c (transfer_msg): Disallow vtrash for now...
+
* mail-ops.c (add_vtrash_info): Use g_strcasecmp() when looking
for a Trash folder - it may be lowercase or something funky.
(transfer_messages_transfer): Special-case vtrash folders.
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 5610ddc8c7..f9dc27dee2 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -52,8 +52,6 @@
#include "mail-send-recv.h"
-#include <camel/camel-vtrash-folder.h>
-
char *default_drafts_folder_uri;
CamelFolder *drafts_folder = NULL;
char *default_sent_folder_uri;
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 05d363cdb6..d0662b0266 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -54,7 +54,7 @@
#include <camel/camel-mime-message.h>
#include <camel/camel-stream-mem.h>
-#define d(x) x
+#define d(x)
#define PARENT_TYPE (gtk_table_get_type ())
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index b982fc1c97..b20ee1baf0 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -971,7 +971,7 @@ transfer_msg (GtkWidget *widget, gpointer user_data, gboolean delete_from_source
GPtrArray *uids;
char *uri, *physical, *path;
char *desc;
- const char *allowed_types[] = { "mail", "vtrash", NULL };
+ const char *allowed_types[] = { "mail", /*"vtrash",*/ NULL };
extern EvolutionShellClient *global_shell_client;
static char *last = NULL;
@@ -983,8 +983,8 @@ transfer_msg (GtkWidget *widget, gpointer user_data, gboolean delete_from_source
else
desc = _("Copy message(s) to");
- evolution_shell_client_user_select_folder (global_shell_client, desc, last,
- allowed_types, &uri, &physical);
+ evolution_shell_client_user_select_folder (global_shell_client, desc, last,
+ allowed_types, &uri, &physical);
if (!uri)
return;
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 5f77db80d4..3372754fcd 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -351,7 +351,7 @@ init_trash (CamelStore *store)
{
MailLocalStore *local_store = MAIL_LOCAL_STORE (store);
- store->vtrash = camel_vtrash_folder_new (store, _("Trash"));
+ store->vtrash = camel_vtrash_folder_new (store, CAMEL_VTRASH_NAME);
if (store->vtrash) {
/* attach to the finalize event of the vtrash */
@@ -465,15 +465,14 @@ register_folder_register(struct _mail_msg *mm)
meta = load_metainfo (name);
g_free (name);
- camel_operation_register(mm->cancel);
-
+ camel_operation_register (mm->cancel);
name = g_strdup_printf ("%s:%s", meta->format, path);
store = camel_session_get_store (session, name, &mm->ex);
g_free (name);
if (!store) {
free_metainfo (meta);
- camel_operation_unregister(mm->cancel);
+ camel_operation_unregister (mm->cancel);
return;
}
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index e6c516a46e..b9553d7570 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1016,14 +1016,14 @@ add_vtrash_info (CamelFolderInfo *info)
g_return_if_fail (info != NULL);
for (fi = info; fi->sibling; fi = fi->sibling) {
- if (!g_strcasecmp (fi->name, _("Trash")))
+ if (!strcmp (fi->name, CAMEL_VTRASH_NAME))
break;
}
/* create our vTrash URL */
url = camel_url_new (info->url, NULL);
g_free (url->path);
- url->path = g_strdup_printf ("/%s", _("Trash"));
+ url->path = g_strdup_printf ("/%s", CAMEL_VTRASH_NAME);
uri = camel_url_to_string (url, 0);
camel_url_free (url);
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index cf140f7643..c72a5d2d02 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -253,23 +253,23 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex)
CamelStore *store = NULL;
CamelFolder *folder = NULL;
int offset = 0;
-
+
g_return_val_if_fail (uri != NULL, NULL);
-
+
folder = mail_folder_cache_try_folder (uri);
if (folder) {
camel_object_ref (CAMEL_OBJECT (folder));
return folder;
}
-
+
if (!strncmp (uri, "vtrash:", 7))
offset = 7;
-
+
url = camel_url_new (uri + offset, ex);
if (!url) {
return NULL;
}
-
+
if (!strcmp (url->protocol, "vfolder")) {
folder = vfolder_uri_to_folder (uri, ex);
} else {
@@ -287,7 +287,7 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex)
else
name = "";
}
-
+
if (offset)
folder = camel_store_get_trash (store, ex);
else
@@ -296,7 +296,7 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex)
camel_object_unref (CAMEL_OBJECT (store));
}
}
-
+
if (camel_exception_is_set (ex)) {
if (folder) {
camel_object_unref (CAMEL_OBJECT (folder));
@@ -304,9 +304,9 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex)
}
} else
mail_folder_cache_note_folder (uri, folder);
-
+
camel_url_free (url);
-
+
return folder;
}