2007-06-14 Murray Cumming <murrayc@murrayc.com>

* src/widgets/modest-folder-view.c: (filter_row):
Explictly filter out the per-account outbox accounts. I don't know why
these only sometimes show up, but now they should never show up in the UI.
This should fix projects.maemo.org bug NB#60160.

pmo-trunk-r2230

diff --git a/ChangeLog2 b/ChangeLog2
index 7a7c9a9..0e3ec1c 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,12 @@
 2007-06-14  Murray Cumming  <murrayc@murrayc.com>
 
+       * src/widgets/modest-folder-view.c: (filter_row):
+       Explictly filter out the per-account outbox accounts. I don't know why 
+       these only sometimes show up, but now they should never show up in the UI.
+       This should fix projects.maemo.org bug NB#60160.
+
+2007-06-14  Murray Cumming  <murrayc@murrayc.com>
+
        * src/maemo/modest-main-window.c: (set_toolbar_mode): Prevent a warning
        when the toolbar does not exist yet.
        * src/modest-widget-memory.c: (save_settings_header_view):

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 64831a7..0c4dbe8 100644 (file)
--- 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;
                }
        }