/* 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);
}
}
}
+
+ /* The virtual local-folders folder store is also shown by default. */
g_object_unref (instance);
* 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;
&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);
&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",