Atached is a modified version of torkel's original patch (basically just
the addition of the _("Inbox") stuff).
ok, seems last week's e-msg-composer-select-file.c patch broke attaching
files if USE_GTKFILECHOOSER is undefined, so I'll just paste the patch:
Index: camel-imap4-store.c
===================================================================
RCS
file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-store.c,v
retrieving revision 1.50
diff -u -r1.50 camel-imap4-store.c
--- camel-imap4-store.c 4 Feb 2005 03:09:34 -0000 1.50
+++ camel-imap4-store.c 14 Feb 2005 21:28:22 -0000
@@ -1,6 +1,8 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8
-*- */
-/* Camel
- * Copyright (C) 1999-2004 Jeffrey Stedfast
+/*
+ * Authors: Jeffrey Stedfast <fejj novell com>
+ *
+ * Copyright 2005 Novell, Inc. (www.novell.com)
*
* This program is free software; you can redistribute it and/or
modify
* it under the terms of the GNU General Public License as published
by
@@ -15,6 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307,
USA.
+ *
*/
@@ -1242,6 +1245,9 @@
fi->unread = -1;
fi->total = -1;
+ if (!g_ascii_strcasecmp (fi->full_name, "INBOX"))
+ fi->flags |= CAMEL_FOLDER_SYSTEM | CAMEL_FOLDER_TYPE_INBOX;
+
/* SELECTED folder, just get it from the folder */
if (folder && !strcmp (folder->full_name, fi->full_name)) {
camel_object_get (folder, NULL, CAMEL_FOLDER_TOTAL, &fi->total,
CAMEL_FOLDER_UNREAD, &fi->unread, 0);
@@ -1252,12 +1258,17 @@
if (!(fi->flags & CAMEL_FOLDER_SUBSCRIBED))
imap4_subscription_info (store, fi);
- g_free (list->name);
- g_free (list);
-
array->pdata[i] = fi;
camel_imap4_store_summary_note_info (((CamelIMAP4Store *)
store)->summary, fi);
+
+ if (!g_ascii_strcasecmp (fi->full_name, "INBOX")) {
+ g_free (fi->name);
+ fi->name = g_strdup (_("Inbox"));
+ }
+
+ g_free (list->name);
+ g_free (list);
}
fi = camel_folder_info_build (array, top, '/', TRUE);
Index: camel-imap4-store-summary.c
===================================================================
RCS
file: /cvs/gnome/evolution-data-server/camel/providers/imap4/camel-imap4-store-summary.c,v
retrieving revision 1.5
diff -u -r1.5 camel-imap4-store-summary.c
--- camel-imap4-store-summary.c 12 Jan 2005 17:29:30 -0000 1.5
+++ camel-imap4-store-summary.c 14 Feb 2005 21:28:22 -0000
@@ -31,6 +31,7 @@
#include <unistd.h>
#include <errno.h>
+#include <camel/camel-i18n.h>
#include <camel/camel-store.h>
#include <camel/camel-file-utils.h>
@@ -352,14 +353,22 @@
store_info_to_folder_info (CamelStoreSummary *s, CamelStoreInfo *si)
{
CamelFolderInfo *fi;
+ const char *name;
fi = g_malloc0 (sizeof (CamelFolderInfo));
fi->full_name = g_strdup (camel_store_info_path (s, si));
- fi->name = g_strdup (camel_store_info_name (s, si));
fi->uri = g_strdup (camel_store_info_uri (s, si));
fi->flags = si->flags;
fi->unread = si->unread;
fi->total = si->total;
+
+ name = camel_store_info_name (s, si);
+ if (!g_ascii_strcasecmp (fi->full_name, "INBOX")) {
+ fi->flags |= CAMEL_FOLDER_SYSTEM | CAMEL_FOLDER_TYPE_INBOX;
+ fi->name = g_strdup (_("Inbox"));
+ } else {
+ fi->name = g_strdup (name);
+ }
return fi;
}
On Mon, 2005-02-14 at 12:05 +0800, Not Zed wrote:
>
> while you're at it, i think perhaps it should set the fi->name to
> _("Inbox"), so it is translated as well (currently this isn't the case
> in imap, although i don't see why it shouldn't do this. it isn't a
> string change as Inbox is already available).
>
> (but i guess jeff may wish to comment on this patch also).
>
> On Sun, 2005-02-13 at 13:55 +0100, Björn Torkelsson wrote:
> > Needed to get the inbox first in the folder listning.
> >
> > /torkel
--
Jeffrey Stedfast
Evolution Hacker - Novell, Inc.
fejj ximian com - www.novell.com
Attachment:
smime.p7s
Description: S/MIME cryptographic signature