* src/hildon2/com.nokia.modest.service.in: also set shutdown timeout to 30

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

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 051fef6..8e35c0f 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -850,10 +850,10 @@ messages_cell_data  (GtkTreeViewColumn *column,
 
                if (priv->cell_style == MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT) {
                        if (number > 1) {
-                               item_name = g_strdup_printf (drafts?_("mcen_ti_messages"):_("mcen_ti_new_messages_plural"), 
+                               item_name = g_strdup_printf (drafts?_("mcen_ti_messages"):_("mcen_va_new_messages"), 
                                                             number);
                        } else if (number == 1) {
-                               item_name = g_strdup_printf (drafts?_("mcen_ti_message"):_("mcen_ti_new_messages_singular"), 
+                               item_name = g_strdup_printf (drafts?_("mcen_ti_message"):_("mcen_va_new_message"), 
                                                             number);
                        }
                } 
@@ -2414,9 +2414,11 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                   cause (and it actually does it) a free of the
                   summary of the folder (because the main window will
                   clear the headers view */
+#ifndef MODEST_TOOLKIT_HILDON2
                if (TNY_IS_FOLDER(priv->cur_folder_store))
                        tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store),
                                               FALSE, NULL, NULL, NULL);
+#endif
 
                g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
                       priv->cur_folder_store, FALSE);