aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-04-27 16:17:40 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-04-27 16:17:40 +0800
commit81d3fd68b3d62326b88d59fa99f61655ab14cd21 (patch)
treef274e527f4da626fc43893c0d9dcbbbd5f7a8d43 /mail
parent6869e5d7d0fe73760728712d074495eaa116b10c (diff)
downloadgsoc2013-evolution-81d3fd68b3d62326b88d59fa99f61655ab14cd21.tar.gz
gsoc2013-evolution-81d3fd68b3d62326b88d59fa99f61655ab14cd21.tar.zst
gsoc2013-evolution-81d3fd68b3d62326b88d59fa99f61655ab14cd21.zip
** See bug #57659.
2004-04-27 Not Zed <NotZed@Ximian.com> ** See bug #57659. * mail-ops.c (fix_unmatched_info): removed, done in camel now. svn path=/trunk/; revision=25625
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/em-folder-tree.c2
-rw-r--r--mail/mail-ops.c16
3 files changed, 5 insertions, 17 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ac324c8686..edc5b11800 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,9 @@
2004-04-27 Not Zed <NotZed@Ximian.com>
+ ** See bug #57659.
+
+ * mail-ops.c (fix_unmatched_info): removed, done in camel now.
+
** See bug #57511.
* mail-config.glade: gave the whole smime frame (vbox) a name so
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 8c64197842..7365f6f920 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1052,7 +1052,7 @@ tree_drag_data_received(GtkWidget *widget, GdkDragContext *context, int x, int y
gtk_drag_finish (context, FALSE, FALSE, GDK_CURRENT_TIME);
return;
}
-
+
full_name = path[0] == '/' ? path + 1 : path;
m = mail_msg_new (&emft_drop_async_op, NULL, sizeof (struct _DragDataReceivedAsync));
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index cf0c6fb62e..d38cf4ff66 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -997,20 +997,6 @@ get_folderinfo_desc (struct _mail_msg *mm, int done)
}
static void
-fix_unmatched_info(CamelFolderInfo *fi)
-{
- for (; fi; fi = fi->next) {
- if (!strcmp(fi->full_name, CAMEL_UNMATCHED_NAME)) {
- g_free(fi->name);
- fi->name = g_strdup(_("Unmatched"));
- g_free(fi->path);
- fi->path = g_strdup_printf("/%s", fi->name);
- break;
- }
- }
-}
-
-static void
get_folderinfo_get (struct _mail_msg *mm)
{
struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm;
@@ -1020,8 +1006,6 @@ get_folderinfo_get (struct _mail_msg *mm)
flags |= CAMEL_STORE_FOLDER_INFO_SUBSCRIBED;
m->info = camel_store_get_folder_info (m->store, NULL, flags, &mm->ex);
- if (m->info && CAMEL_IS_VEE_STORE(m->store))
- fix_unmatched_info(m->info);
}
static void