From 1d45928aaaa0d415c3f34896c1b59cc7cdac2df0 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Mon, 16 Mar 2009 15:50:28 +0000 Subject: [PATCH] Add mail operation tracking for progress hint in folder window (fixes NB#105911). pmo-trunk-r8047 --- src/hildon2/modest-folder-window.c | 124 ++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 4 deletions(-) diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index 04aaf87..7598025 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -92,6 +92,10 @@ static gboolean on_map_event (GtkWidget *widget, GdkEvent *event, gpointer userdata); static void update_progress_hint (ModestFolderWindow *self); +static void on_queue_changed (ModestMailOperationQueue *queue, + ModestMailOperation *mail_op, + ModestMailOperationQueueNotification type, + ModestFolderWindow *self); typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate; struct _ModestFolderWindowPrivate { @@ -105,6 +109,7 @@ struct _ModestFolderWindowPrivate { gchar *current_store_account; gboolean progress_hint; + guint queue_change_handler; }; #define MODEST_FOLDER_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_FOLDER_WINDOW, \ @@ -174,6 +179,7 @@ modest_folder_window_init (ModestFolderWindow *obj) "applications_email_folderview"); priv->progress_hint = FALSE; priv->current_store_account = NULL; + priv->queue_change_handler = 0; } static void @@ -201,6 +207,11 @@ modest_folder_window_disconnect_signals (ModestWindow *self) ModestFolderWindowPrivate *priv; priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self); + if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_mail_operation_queue ()), + priv->queue_change_handler)) + g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), + priv->queue_change_handler); + modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers); priv->sighandlers = NULL; } @@ -293,6 +304,13 @@ modest_folder_window_new (TnyFolderStoreQuery *query) priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self); pannable = hildon_pannable_area_new (); + + priv->queue_change_handler = + g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), + "queue-changed", + G_CALLBACK (on_queue_changed), + self); + priv->folder_view = modest_platform_create_folder_view (query); modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (priv->folder_view), MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT); @@ -630,16 +648,46 @@ on_map_event (GtkWidget *widget, return FALSE; } +static gboolean +has_active_operations (ModestFolderWindow *self) +{ + GSList *operations = NULL, *node; + ModestMailOperationQueue *queue; + gboolean has_active = FALSE; + + queue = modest_runtime_get_mail_operation_queue (); + operations = modest_mail_operation_queue_get_by_source (queue, G_OBJECT (self)); + + for (node = operations; node != NULL; node = g_slist_next (node)) { + if (!modest_mail_operation_is_finished (MODEST_MAIL_OPERATION (node->data))) { + has_active = TRUE; + break; + } + } + + if (operations) { + g_slist_foreach (operations, (GFunc) g_object_unref, NULL); + g_slist_free (operations); + } + + return has_active; +} + static void update_progress_hint (ModestFolderWindow *self) { ModestFolderWindowPrivate *priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); - if (!priv->current_store_account) - return; + if (has_active_operations (self)) { + priv->progress_hint = TRUE; + } + + if (!priv->progress_hint && priv->current_store_account) { + priv->progress_hint = modest_window_mgr_has_progress_operation_on_account (modest_runtime_get_window_mgr (), + priv->current_store_account); + } - priv->progress_hint = modest_window_mgr_has_progress_operation_on_account (modest_runtime_get_window_mgr (), - priv->current_store_account); + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self)); if (GTK_WIDGET_VISIBLE (self)) { hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint ? 1:0); @@ -660,3 +708,71 @@ modest_folder_window_transfer_mode_enabled (ModestFolderWindow *self) return priv->progress_hint; } + +static void +on_mail_operation_started (ModestMailOperation *mail_op, + gpointer user_data) +{ + ModestFolderWindow *self; + ModestMailOperationTypeOperation op_type; + GObject *source = NULL; + + self = MODEST_FOLDER_WINDOW (user_data); + op_type = modest_mail_operation_get_type_operation (mail_op); + source = modest_mail_operation_get_source(mail_op); + if (G_OBJECT (self) == source) { + update_progress_hint (self); + } + g_object_unref (source); +} + +static void +on_mail_operation_finished (ModestMailOperation *mail_op, + gpointer user_data) +{ + ModestFolderWindow *self; + + self = MODEST_FOLDER_WINDOW (user_data); + + /* Don't disable the progress hint if there are more pending + operations from this window */ + update_progress_hint (self); + + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self)); +} + +static void +on_queue_changed (ModestMailOperationQueue *queue, + ModestMailOperation *mail_op, + ModestMailOperationQueueNotification type, + ModestFolderWindow *self) +{ + ModestFolderWindowPrivate *priv; + + priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); + + /* If this operations was created by another window, do nothing */ + if (!modest_mail_operation_is_mine (mail_op, G_OBJECT(self))) + return; + + if (type == MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED) { + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (mail_op), + "operation-started", + G_CALLBACK (on_mail_operation_started), + self); + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (mail_op), + "operation-finished", + G_CALLBACK (on_mail_operation_finished), + self); + } else if (type == MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED) { + priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, + G_OBJECT (mail_op), + "operation-started"); + priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, + G_OBJECT (mail_op), + "operation-finished"); + } +} + -- 1.7.9.5