2007-07-11 Johannes Schmid <johannes.schmid@openismus.com>

[modest] / src / widgets / modest-folder-view.c

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 46e5d4d..cb6c012 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -989,14 +989,27 @@ filter_row (GtkTreeModel *model,
                retval = !found;
        }
        
+       
+       /* If this is a move to dialog, hide Sent, Outbox and Drafts
+       folder as no message can be move there according to UI specs */
        if (!priv->show_non_move)
        {
                switch (type)
                {
                        case TNY_FOLDER_TYPE_OUTBOX:
                        case TNY_FOLDER_TYPE_SENT:
+                       case TNY_FOLDER_TYPE_DRAFTS:
                                retval = FALSE;
                                break;
+                       case TNY_FOLDER_TYPE_UNKNOWN:
+                       case TNY_FOLDER_TYPE_NORMAL:
+                               type = modest_tny_folder_guess_folder_type(TNY_FOLDER(instance));
+                               if (type == TNY_FOLDER_TYPE_OUTBOX || type == TNY_FOLDER_TYPE_SENT
+                                               || type == TNY_FOLDER_TYPE_DRAFTS)
+                               {
+                                       retval = FALSE;
+                               }
+                               break;
                        default:
                                break;  
                }