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/widgets/modest-folder-view.c: (filter_row)
	Guess folder type and hide Sent & Outbox if necessary.
	Fixed project.maemo.org NB#57328

pmo-trunk-r2704

diff --git a/ChangeLog2 b/ChangeLog2
index 3c5d445..f86ce31 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,13 @@
+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/widgets/modest-folder-view.c: (filter_row)
+       Guess folder type and hide Sent & Outbox if necessary.
+       Fixed project.maemo.org NB#57328
+
 2007-07-11  Murray Cumming  <murrayc@murrayc-desktop>
 
        * src/modest-main.c: (main): Only show the UI at the start if 

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index ee2d2aa..1c5f9d7 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -3612,7 +3612,6 @@ modest_ui_actions_on_move_to (GtkAction *action,
 
        /* Create and run the dialog */
        dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view, &tree_view);
-       modest_folder_view_show_non_move_folders (MODEST_FOLDER_VIEW (tree_view), TRUE);
        modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
        result = gtk_dialog_run (GTK_DIALOG(dialog));
        g_object_ref (tree_view);

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 46e5d4d..497d323 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -997,6 +997,14 @@ filter_row (GtkTreeModel *model,
                        case TNY_FOLDER_TYPE_SENT:
                                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)
+                               {
+                                       retval = FALSE;
+                               }
+                               break;
                        default:
                                break;  
                }