X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=e86574fd4e6474f7609e1456999dd6dc94c4af40;hp=64831a70fa2741f88755e32e9f27b49969d4e3bf;hb=2b4e8c186fd0ee99db60d4dbe18e35c617f91abe;hpb=d1c80bcf36c7354ac5afa7ee80708fdb76c632ce

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 64831a7..e86574f 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -43,6 +43,7 @@
 #include <tny-simple-list.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-local-folders-account.h>
+#include <modest-tny-outbox-account.h>
 #include <modest-marshal.h>
 #include <modest-icon-names.h>
 #include <modest-tny-account-store.h>
@@ -729,6 +730,11 @@ filter_row (GtkTreeModel *model,
 				if (priv->visible_account_id && strcmp (account_id, priv->visible_account_id))
 					retval = FALSE;
 			}
+			
+			/* Never show these to the user. They are merged into one folder 
+			 * in the local-folders account instead: */
+			if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc))
+				retval = FALSE;
 		}
 	}
 	
@@ -1657,8 +1663,6 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter
 	return FALSE;
 }
 
-
-
 void 
 modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
 {
@@ -1668,7 +1672,7 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
 
 	/* Do not set it if the folder view was not painted */
 	if (!GTK_WIDGET_MAPPED (self))
-		return;
+		return;	
 
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
 	if (!model)