X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=b547afbf9e84820e97da4bad565480e0163961d1;hp=8aedf4cf105410a62a9053bff04756f3d33bfb50;hb=33b5d84fbaaf8dd4eafe4176dba08213c046463f;hpb=26a46ba0b21f04dd751a4555b1b26177369e0931

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 8aedf4c..b547afb 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -360,10 +360,10 @@ on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data)
 }
 
 static void
-text_cell_data  (GtkTreeViewColumn *column,  
+text_cell_data  (GtkTreeViewColumn *column,
 		 GtkCellRenderer *renderer,
-		 GtkTreeModel *tree_model,  
-		 GtkTreeIter *iter,  
+		 GtkTreeModel *tree_model,
+		 GtkTreeIter *iter,
 		 gpointer data)
 {
 	ModestFolderViewPrivate *priv;
@@ -416,10 +416,16 @@ text_cell_data  (GtkTreeViewColumn *column,
 						    		
 		/* Use bold font style if there are unread or unset messages */
 		if (number > 0) {
-			item_name = g_strdup_printf ("%s (%d)", fname, number);
+			if (type == TNY_FOLDER_TYPE_INBOX)
+				item_name = g_strdup_printf ("%s (%d)", _("mcen_me_folder_inbox"), number);
+			else
+				item_name = g_strdup_printf ("%s (%d)", fname, number);
 			item_weight = 800;
 		} else {
-			item_name = g_strdup (fname);
+			if (type == TNY_FOLDER_TYPE_INBOX)
+				item_name = g_strdup (_("mcen_me_folder_inbox"));
+			else
+				item_name = g_strdup (fname);
 			item_weight = 400;
 		}
 		
@@ -2512,9 +2518,9 @@ on_drag_motion (GtkWidget      *widget,
 
 	/* Expand the selected row after 1/2 second */
 	if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), dest_row)) {
-		gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos);
 		priv->timer_expander = g_timeout_add (500, expand_row_timeout, widget);
 	}
+	gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos);
 
 	/* Select the desired action. By default we pick MOVE */
 	suggested_action = GDK_ACTION_MOVE;
@@ -2531,8 +2537,9 @@ on_drag_motion (GtkWidget      *widget,
  out:
 	if (folder)
 		g_object_unref (folder);
-	if (dest_row)
+	if (dest_row) {
 		gtk_tree_path_free (dest_row);
+	}
 	g_signal_stop_emission_by_name (widget, "drag-motion");
 
 	return valid_location;