[anjal] BUGFIX: Moblin Bugzilla #4657 - Show junk/trash names right

[Srinivasa Ragavan <sragavan src gnome org>]

commit 954e8bb4434d7065177616f6366e33cd990f2081
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Thu Jul 23 13:45:04 2009 +0530

    BUGFIX: Moblin Bugzilla #4657 - Show junk/trash names right

 src/mail-folder-view.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/src/mail-folder-view.c b/src/mail-folder-view.c
index b1375c4..86ac3c9 100644
--- a/src/mail-folder-view.c
+++ b/src/mail-folder-view.c
@@ -209,6 +209,17 @@ mfv_close (GtkButton *w, MailFolderView *mfv)
 	g_signal_emit (mfv, signals[VIEW_CLOSE], 0);			
 }
 
+static char *
+mfv_folder_name (char *name)
+{
+	if (strcmp(name, CAMEL_VTRASH_NAME) == 0)
+		return _("Trash");
+	else if (strcmp (name, CAMEL_VJUNK_NAME) == 0)
+		return _("Junk");
+
+	return name;
+}
+
 static void
 mail_folder_view_init (MailFolderView  *shell)
 {
@@ -447,7 +458,7 @@ mfv_folder_renamed (CamelStore *store, void *event, void *data)
 		g_free(mfv->priv->folder_name);
 		mfv->uri = g_strdup(info->new->uri);
 		mfv->priv->folder_name = g_strdup (info->new->full_name);
-		gtk_label_set_text ((GtkLabel *)mfv->priv->tab_str, info->new->full_name);
+		gtk_label_set_text ((GtkLabel *)mfv->priv->tab_str, mfv_folder_name(info->new->full_name));
 	}
 }
 
@@ -501,7 +512,7 @@ mail_folder_view_set_folder (MailFolderView *mfv, CamelFolder *folder, const cha
 		if (spos && *spos) {
 			pos = strtod(spos, NULL);
 		}
-		gtk_label_set_text ((GtkLabel *)mfv->priv->tab_str, folder->full_name);
+		gtk_label_set_text ((GtkLabel *)mfv->priv->tab_str, mfv_folder_name(folder->full_name));
 		gtk_adjustment_set_value(gtk_scrolled_window_get_vadjustment ((GtkScrolledWindow *)mfv->priv->view_scroller), pos);
 		if (last_sel_uid && *last_sel_uid) {
 			 GtkTreeSelection *sel = gtk_tree_view_get_selection (mfv->tree);