X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=84aa8e63f6b273224e3bed6023eea9502bd2f7c9;hb=fd958e8a96328612ae617b3f04627781d6dc7b1f;hp=6df05de325d7220459e67ab0eb0af3f9b9eab93a;hpb=6da3c27d0ac2baf2c1c13b846d0c609b8a48c582;p=modest

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 6df05de..84aa8e6 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -701,11 +701,7 @@ filter_row (GtkTreeModel *model,
 			
 			/* If it isn't a special folder, 
 			 * don't show it unless it is the visible account: */
-			if (strcmp (account_id, MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID) &&
-			    strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { 
-				
-				/* TODO: Merge the folders before we get to this point? */
-				
+			if (strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { 
 				/* Show only the visible account id */
 				ModestFolderViewPrivate *priv = 
 					MODEST_FOLDER_VIEW_GET_PRIVATE (data);
@@ -714,6 +710,8 @@ filter_row (GtkTreeModel *model,
 			}
 		}
 	}
+	
+	/* The virtual local-folders folder store is also shown by default. */
 
 	g_object_unref (instance);
 
@@ -1158,18 +1156,19 @@ typedef struct _DndHelper {
  * and drop action
  */
 static void
-on_progress_changed (ModestMailOperation *mail_op, gpointer user_data)
+on_progress_changed (ModestMailOperation *mail_op, 
+		     ModestMailOperationState *state,
+		     gpointer user_data)
 {
 	gboolean success;
 	DndHelper *helper;
 
 	helper = (DndHelper *) user_data;
 
-	if (!modest_mail_operation_is_finished (mail_op))
+	if (!state->finished)
 		return;
 
-	if (modest_mail_operation_get_status (mail_op) == 
-	    MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
+	if (state->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
 		success = TRUE;
 	} else {
 		success = FALSE;
@@ -1214,7 +1213,7 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
 			    &folder, -1);
 
 	/* Transfer message */
-	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, NULL);
+	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL);
 
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 					 mail_op);
@@ -1275,7 +1274,7 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
 			    &folder, -1);
 
 	/* Do the mail operation */
-	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, NULL);
+	mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL);
 	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
 					 mail_op);
 	g_signal_connect (G_OBJECT (mail_op), "progress-changed",