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

* src/widgets/modest-folder-view.c: (filter_row)
	Do not show drafts folder (see UI specs)

pmo-trunk-r2705

diff --git a/ChangeLog2 b/ChangeLog2
index f86ce31..902808d 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,10 @@
 2007-07-11  Johannes Schmid <johannes.schmid@openismus.com>
 
 2007-07-11  Johannes Schmid <johannes.schmid@openismus.com>
 

+       * src/widgets/modest-folder-view.c: (filter_row)
+       Do not show drafts folder (see UI specs)
+
+2007-07-11  Johannes Schmid <johannes.schmid@openismus.com>
+

        * src/modest-ui-actions.c:
        Remove call to show_non_move_folders(TRUE) which was moved to a wrong
        place and also not necessary.
        * src/modest-ui-actions.c:
        Remove call to show_non_move_folders(TRUE) which was moved to a wrong
        place and also not necessary.

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 497d323..cb6c012 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -989,18 +989,23 @@ filter_row (GtkTreeModel *model,
                retval = !found;
        }
        
                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:
        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));
                                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)
+                               if (type == TNY_FOLDER_TYPE_OUTBOX || type == TNY_FOLDER_TYPE_SENT
+                                               || type == TNY_FOLDER_TYPE_DRAFTS)

                                {
                                        retval = FALSE;
                                }
                                {
                                        retval = FALSE;
                                }