From: Sergio Villar Senin Date: Mon, 11 Feb 2008 17:27:35 +0000 (+0000) Subject: * created a new method in modest-platform to make it easy to connect to two accounts X-Git-Tag: git_migration_finished~1694 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=f82ebf3c3924cf7030e44436f0ab16bf042ed938 * created a new method in modest-platform to make it easy to connect to two accounts * Fixes NB#80155, IMAP folders could be moved again to the MMC account pmo-trunk-r4160 --- diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index f325631..44271d5 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -2144,6 +2144,44 @@ modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, return; } +static void +src_account_connect_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *src_account, + gpointer user_data) +{ + DoubleConnectionInfo *info = (DoubleConnectionInfo *) user_data; + + if (canceled || err) { + /* If there was any error call the user callback */ + info->callback (canceled, err, parent_window, src_account, info->data); + } else { + /* Connect the destination account */ + modest_platform_connect_if_remote_and_perform (parent_window, TRUE, + TNY_FOLDER_STORE (info->dst_account), + info->callback, info->data); + } + + /* Free the info object */ + g_object_unref (info->dst_account); + g_slice_free (DoubleConnectionInfo, info); +} + + +void +modest_platform_double_connect_and_perform (GtkWindow *parent_window, + gboolean force, + TnyFolderStore *folder_store, + DoubleConnectionInfo *connect_info) +{ + modest_platform_connect_if_remote_and_perform(parent_window, + force, + folder_store, + src_account_connect_performer, + connect_info); +} + GtkWidget * modest_platform_get_account_settings_dialog (ModestAccountSettings *settings) { diff --git a/src/modest-platform.h b/src/modest-platform.h index 28f1b9f..27f4872 100644 --- a/src/modest-platform.h +++ b/src/modest-platform.h @@ -422,6 +422,12 @@ typedef void (*ModestConnectedPerformer) (gboolean canceled, TnyAccount *account, gpointer user_data); +typedef struct { + TnyAccount *dst_account; + ModestConnectedPerformer callback; + gpointer data; +} DoubleConnectionInfo; + /* * modest_platform_connect_and_perform: * @force: force the device to connect if we're offline, if FALSE then it does not connect if required @@ -458,6 +464,19 @@ void modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window, ModestConnectedPerformer callback, gpointer user_data); +/* + * modest_platform_double_connect_and_perform: + * @parent_window: the parent #GtkWindow for any interactive or progress feedback UI. + * @folder_store: The folder store (folder or account) that might need a connection in subsequent operations. + * @callback: will be called when finished, can be NULL + * @info: + * + */ +void modest_platform_double_connect_and_perform (GtkWindow *parent_window, + gboolean force, + TnyFolderStore *folder_store, + DoubleConnectionInfo *info); + /** * modest_platform_get_account_settings_dialog: * @settings: a #ModestAccountSettings diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 9024860..ef49af6 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -4655,36 +4655,6 @@ xfer_messages_from_move_to_cb (gboolean canceled, GError *err, } typedef struct { - TnyAccount *dst_account; - ModestConnectedPerformer callback; - gpointer data; -} DoubleConnectionInfo; - -static void -src_account_connect_performer (gboolean canceled, - GError *err, - GtkWindow *parent_window, - TnyAccount *src_account, - gpointer user_data) -{ - DoubleConnectionInfo *info = (DoubleConnectionInfo *) user_data; - - if (canceled || err) { - /* If there was any error call the user callback */ - info->callback (canceled, err, parent_window, src_account, info->data); - } else { - /* Connect the destination account */ - modest_platform_connect_if_remote_and_perform (parent_window, TRUE, - TNY_FOLDER_STORE (info->dst_account), - info->callback, info->data); - } - - /* Free the info object */ - g_object_unref (info->dst_account); - g_slice_free (DoubleConnectionInfo, info); -} - -typedef struct { TnyFolder *src_folder; TnyFolderStore *dst_folder; gboolean delete_original; @@ -4757,6 +4727,15 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window, g_free (user_data); } +static TnyAccount * +get_account_from_folder_store (TnyFolderStore *folder_store) +{ + if (TNY_IS_ACCOUNT (folder_store)) + return g_object_ref (folder_store); + else + return tny_folder_get_account (TNY_FOLDER (folder_store)); +} + /* * UI handler for the "Move to" action when invoked from the * ModestMainWindow @@ -4785,29 +4764,30 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, /* Allow only to transfer folders to the local root folder */ if (TNY_IS_ACCOUNT (dst_folder) && - !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder)) { + !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (dst_folder) && + !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (dst_folder))) { do_xfer = FALSE; } else if (!TNY_IS_FOLDER (src_folder)) { g_warning ("%s: src_folder is not a TnyFolder.\n", __FUNCTION__); do_xfer = FALSE; - } /* else if (!online && modest_tny_folder_store_is_remote(src_folder)) { - guint num_headers = tny_folder_get_all_count(TNY_FOLDER (src_folder)); - TnyAccount *account = tny_folder_get_account (TNY_FOLDER (src_folder)); - if (!connect_to_get_msg(MODEST_WINDOW (win), num_headers, account)) - do_xfer = FALSE; - g_object_unref (account); - }*/ + } - if (do_xfer) { + if (do_xfer) { MoveFolderInfo *info = g_new0 (MoveFolderInfo, 1); - info->src_folder = TNY_FOLDER (src_folder); - info->dst_folder = dst_folder; + DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo); + + info->src_folder = g_object_ref (src_folder); + info->dst_folder = g_object_ref (dst_folder); info->delete_original = TRUE; info->folder_view = folder_view; - g_object_ref (G_OBJECT (info->src_folder)); - g_object_ref (G_OBJECT (info->dst_folder)); - modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE, - TNY_FOLDER_STORE (dst_folder), on_move_folder_cb, info); + + connect_info->callback = on_move_folder_cb; + connect_info->dst_account = get_account_from_folder_store (TNY_FOLDER_STORE (dst_folder)); + connect_info->data = info; + + modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE, + TNY_FOLDER_STORE (src_folder), + connect_info); } } else if (gtk_widget_is_focus (GTK_WIDGET(header_view))) { gboolean do_xfer = TRUE; @@ -4840,15 +4820,14 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action, g_object_unref(headers); } if (do_xfer) /* Transfer messages */ { - DoubleConnectionInfo *info = g_slice_new (DoubleConnectionInfo); - info->callback = xfer_messages_from_move_to_cb; - info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder)); - info->data = g_object_ref (dst_folder); - - modest_platform_connect_if_remote_and_perform(GTK_WINDOW (win), TRUE, - TNY_FOLDER_STORE (src_folder), - src_account_connect_performer, - info); + DoubleConnectionInfo *connect_info = g_slice_new (DoubleConnectionInfo); + connect_info->callback = xfer_messages_from_move_to_cb; + connect_info->dst_account = tny_folder_get_account (TNY_FOLDER (dst_folder)); + connect_info->data = g_object_ref (dst_folder); + + modest_platform_double_connect_and_perform(GTK_WINDOW (win), TRUE, + TNY_FOLDER_STORE (src_folder), + connect_info); } }