* Partially fixes the last issue with the "no messages to show dialog". I say parti...

pmo-trunk-r4058

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 0f0b135..b09baec 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -1865,7 +1865,7 @@ on_msg_count_changed (ModestHeaderView *header_view,
        gboolean folder_empty = FALSE;
        gboolean all_marked_as_deleted = FALSE;
        ModestMainWindowPrivate *priv;
-       
+
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
        g_return_if_fail (TNY_IS_FOLDER(folder));
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
@@ -1876,25 +1876,20 @@ on_msg_count_changed (ModestHeaderView *header_view,
                changed = tny_folder_change_get_changed (change);
                /* If something changes */
                if ((changed) & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT)
-                       folder_empty = (tny_folder_change_get_new_all_count (change) == 0);
+                       folder_empty = (((guint) tny_folder_change_get_new_all_count (change)) == 0);
                else
-                       folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0);
-               
+                       folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (folder))) == 0);
+
                /* Play a sound (if configured) and make the LED blink  */
                if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) {
                        modest_platform_on_new_headers_received (NULL, FALSE);
                }
-               
-               /* Checks header removed  (hide marked as DELETED headers) */
-               if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) {
-                       modest_header_view_refilter (MODEST_HEADER_VIEW(priv->header_view));
-               }
        }
 
        /* Check if all messages are marked to be deleted */
        all_marked_as_deleted = modest_header_view_is_empty (header_view);
-       folder_empty = folder_empty || all_marked_as_deleted ;
-       
+       folder_empty = folder_empty || all_marked_as_deleted;
+
        /* Set contents style of headers view */
        if (folder_empty)  {
                modest_main_window_set_contents_style (main_window,