diff options
| -rw-r--r-- | camel/ChangeLog | 10 | ||||
| -rw-r--r-- | camel/camel-store.c | 8 | ||||
| -rw-r--r-- | camel/camel-vee-store.c | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 04f6c4dce9..382a9b2a3b 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,13 @@ +2004-04-27 Not Zed <NotZed@Ximian.com> + + ** See bug #57659. + + * camel-vee-store.c (vee_get_folder_info): translate Unmatched in + the folder display name. + + * camel-store.c (add_special_info): dont translate full_name or + path, only do that for name. + 2004-04-23 Sarfraaz Ahmed <asarfraaz@novell.com> * camel-provider.h: Added HAS_LICENSE flag for allowing camel diff --git a/camel/camel-store.c b/camel/camel-store.c index 9f4a0f9c7f..d9deb41d98 100644 --- a/camel/camel-store.c +++ b/camel/camel-store.c @@ -676,7 +676,7 @@ get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelExcepti } static void -add_special_info (CamelStore *store, CamelFolderInfo *info, const char *name, const char *full_name, gboolean unread_count) +add_special_info (CamelStore *store, CamelFolderInfo *info, const char *name, const char *translated, gboolean unread_count) { CamelFolderInfo *fi, *vinfo, *parent; char *uri, *path; @@ -726,12 +726,12 @@ add_special_info (CamelStore *store, CamelFolderInfo *info, const char *name, co /* Fill in the new fields */ vinfo->flags |= CAMEL_FOLDER_VIRTUAL|CAMEL_FOLDER_SYSTEM|CAMEL_FOLDER_VTRASH; - vinfo->full_name = g_strdup (full_name); - vinfo->name = g_strdup (vinfo->full_name); + vinfo->full_name = g_strdup (name); + vinfo->name = g_strdup (translated); vinfo->uri = uri; if (!unread_count) vinfo->unread = -1; - vinfo->path = g_strdup_printf ("/%s", vinfo->name); + vinfo->path = g_strdup_printf ("/%s", vinfo->full_name); } static void diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c index c25f252af4..10321bac00 100644 --- a/camel/camel-vee-store.c +++ b/camel/camel-vee-store.c @@ -326,7 +326,7 @@ vee_get_folder_info(CamelStore *store, const char *top, guint32 flags, CamelExce camel_url_free(url); /*info->url = g_strdup_printf("vfolder:%s#%s", ((CamelService *)store)->url->path, CAMEL_UNMATCHED_NAME);*/ info->full_name = g_strdup(CAMEL_UNMATCHED_NAME); - info->name = g_strdup(CAMEL_UNMATCHED_NAME); + info->name = g_strdup(_("Unmatched")); info->unread = -1; info->flags = CAMEL_FOLDER_NOCHILDREN|CAMEL_FOLDER_NOINFERIORS|CAMEL_FOLDER_SYSTEM|CAMEL_FOLDER_VIRTUAL; camel_folder_info_build_path(info, '/'); |