From e0411b467e3de20f6ea60957e370a15d1dae2f27 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Thu, 1 Oct 2009 17:11:02 +0200 Subject: [PATCH] Cancel account operations on disposing folder window. --- src/hildon2/modest-folder-window.c | 38 ++++++++++++++++++++++++++++++++++++ src/widgets/modest-folder-view.c | 18 +++++++++++++++++ src/widgets/modest-folder-view.h | 10 ++++++++++ 3 files changed, 66 insertions(+) diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index ff85b6b..3b7604a 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -65,6 +66,7 @@ typedef enum { static void modest_folder_window_class_init (ModestFolderWindowClass *klass); static void modest_folder_window_init (ModestFolderWindow *obj); static void modest_folder_window_finalize (GObject *obj); +static void modest_folder_window_dispose (GObject *obj); static void connect_signals (ModestFolderWindow *self); static void modest_folder_window_disconnect_signals (ModestWindow *self); @@ -167,6 +169,7 @@ modest_folder_window_class_init (ModestFolderWindowClass *klass) parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_folder_window_finalize; + gobject_class->dispose = modest_folder_window_dispose; g_type_class_add_private (gobject_class, sizeof(ModestFolderWindowPrivate)); @@ -215,6 +218,41 @@ modest_folder_window_finalize (GObject *obj) } static void +modest_folder_window_dispose (GObject *obj) +{ + ModestFolderWindowPrivate *priv; + + priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(obj); + if (priv->folder_view) { + TnyList *list; + + list = modest_folder_view_get_model_tny_list (MODEST_FOLDER_VIEW (priv->folder_view)); + + if (list) { + TnyIterator *iter; + + iter = tny_list_create_iterator (list); + while (!tny_iterator_is_done (iter)) { + GObject *item = tny_iterator_get_current (iter); + + if (TNY_IS_ACCOUNT (item)) { + if (TNY_IS_FOLDER_STORE (item) && + modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (item))) { + tny_account_cancel (TNY_ACCOUNT (item)); + } + } + g_object_unref (item); + tny_iterator_next (iter); + } + g_object_unref (iter); + } + g_object_unref (list); + } + + G_OBJECT_CLASS(parent_class)->dispose (obj); +} + +static void modest_folder_window_disconnect_signals (ModestWindow *self) { ModestFolderWindowPrivate *priv; diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index c0f7598..bed885b 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -4333,3 +4333,21 @@ on_activity_changed (TnyGtkFolderListStore *store, activity); } #endif + +TnyList * +modest_folder_view_get_model_tny_list (ModestFolderView *self) +{ + GtkTreeModel *model; + TnyList *ret_value; + + ret_value = NULL; + model = NULL; + + if (get_inner_models (MODEST_FOLDER_VIEW (self), NULL, NULL, (GtkTreeModel **) &model)) { + ret_value = TNY_LIST (model); + g_object_ref (ret_value); + } + + return ret_value; + +} diff --git a/src/widgets/modest-folder-view.h b/src/widgets/modest-folder-view.h index 3c475ff..1b098aa 100644 --- a/src/widgets/modest-folder-view.h +++ b/src/widgets/modest-folder-view.h @@ -371,6 +371,16 @@ void modest_folder_view_show_message_count (ModestFolderView *self, */ gboolean modest_folder_view_get_activity (ModestFolderView *self); +/** + * modest_folder_view_get_model_tny_list: + * @self: a #ModestFolderView + * + * obtains the #TnyList model containing the accounts in the folder view. + * + * Returns: a caller owner #TnyList + */ +TnyList *modest_folder_view_get_model_tny_list (ModestFolderView *self); + G_END_DECLS #endif /* __MODEST_FOLDER_VIEW_H__ */ -- 1.7.9.5