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

* src/widgets/modest-folder-view.c:
	Don\'t check for MERGE type anymore as we use the correct type
	now.
	NOTE: For the last two changes you need to update your tinymail copy
	because of API changes!

pmo-trunk-r2568

diff --git a/ChangeLog2 b/ChangeLog2
index 4339f65..3b2d210 100644 (file)
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,3 +1,11 @@
+2007-07-04  Johannes Schmid <johannes.schmid@openismus.com>
+
+       * src/widgets/modest-folder-view.c:
+       Don't check for MERGE type anymore as we use the correct type
+       now.
+       NOTE: For the last two changes you need to update your tinymail copy
+       because of API changes!
+

 2007-07-04  Johanens Schmid <johannes.schmid@openismus.com>
 
        * src/modest-tny-local-folders-account.c:
 2007-07-04  Johanens Schmid <johannes.schmid@openismus.com>
 
        * src/modest-tny-local-folders-account.c:

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 498ab17..45a53d7 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -484,11 +484,11 @@ icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                return;
        }
 
                return;
        }
 

+       /* MERGE is not needed anymore as the folder now has the correct type jschmid */

        /* We include the MERGE type here because it's used to create
           the local OUTBOX folder */
        if (type == TNY_FOLDER_TYPE_NORMAL || 
        /* We include the MERGE type here because it's used to create
           the local OUTBOX folder */
        if (type == TNY_FOLDER_TYPE_NORMAL || 

-           type == TNY_FOLDER_TYPE_UNKNOWN ||
-           type == TNY_FOLDER_TYPE_MERGE) {
+           type == TNY_FOLDER_TYPE_UNKNOWN) {

                type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
        }
 
                type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
        }