[anjal] Shows Trash & Junk well now. Also hides Trash and Junk from the main

[Srinivasa Ragavan <sragavan src gnome org>]

commit 2d4dd8314566225a8b3591fe2bb8c30b38453f3d
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Fri Sep 4 14:51:17 2009 +0530

    Shows Trash & Junk well now. Also hides Trash and Junk from the main
    folder.

 src/em-tree-store.c    |    6 ++++++
 src/mail-folder-view.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/src/em-tree-store.c b/src/em-tree-store.c
index 761420b..fb82441 100644
--- a/src/em-tree-store.c
+++ b/src/em-tree-store.c
@@ -677,6 +677,12 @@ emts_insert_info_base(EMTreeStore *emts, CamelMessageInfo *mi, struct _emts_fold
 	const CamelSummaryMessageID *mid;
 	const CamelSummaryReferences *references;
 
+
+	if ( ((camel_message_info_flags(mi) & CAMEL_MESSAGE_DELETED) && !emts->trash) ||
+		((camel_message_info_flags(mi) & CAMEL_MESSAGE_JUNK) && !emts->junk)) {
+		return;
+	}
+	
 	mid = camel_message_info_message_id(mi);
 	if (mid
 	    && (match = g_hash_table_lookup(p->id_table, mid))
diff --git a/src/mail-folder-view.c b/src/mail-folder-view.c
index 1421faa..9d59921 100644
--- a/src/mail-folder-view.c
+++ b/src/mail-folder-view.c
@@ -268,7 +268,7 @@ mail_folder_view_init (MailFolderView  *shell)
 		((EMTreeStore *)shell->model)->func = (sort_func)sort_dsent;
 		((EMTreeStore *)shell->model)->sort_ascending = FALSE;
 	}
-	shell->priv->expr = g_strdup ("(match-all (not (system-flag \"junk\")))");
+	shell->priv->expr = g_strdup ("(match-all #t)");
 	shell->tab_label  = gtk_hbox_new (FALSE, 0);
 	shell->menu_label  = gtk_label_new (NULL);
 	shell->priv->tab_str = gtk_label_new (_("Select Folder"));