X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=68bf108e090ec0be75f4618688c57897e04bb5d8;hp=fa279d706725c38d5a2cfb6088d6062896f3ea32;hb=976c05744180efac28a9dc421acefcff18659d67;hpb=de16c483379936730f8cff868f961c46b1ce46ba diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index fa279d7..68bf108 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -27,14 +27,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - #include #include #include #include - +#include "modest-hildon-includes.h" +#include "modest-defs.h" #include #include "widgets/modest-main-window.h" @@ -54,6 +52,15 @@ #include "modest-tny-msg.h" #include "modest-mail-operation.h" #include "modest-icon-names.h" +#include "modest-progress-bar-widget.h" +#include "maemo/modest-osso-state-saving.h" + +#ifdef MODEST_HILDON_VERSION_0 +#include +#else +#include +#endif /*MODEST_HILDON_VERSION_0*/ + /* 'private'/'protected' functions */ static void modest_main_window_class_init (ModestMainWindowClass *klass); @@ -70,6 +77,14 @@ static void save_sizes (ModestMainWindow *self); static void modest_main_window_show_toolbar (ModestWindow *window, gboolean show_toolbar); +static void cancel_progressbar (GtkToolButton *toolbutton, + ModestMainWindow *self); + +static void on_queue_changed (ModestMailOperationQueue *queue, + ModestMailOperation *mail_op, + ModestMailOperationQueueNotification type, + ModestMainWindow *self); + static void on_account_update (TnyAccountStore *account_store, gchar *account_name, gpointer user_data); @@ -83,6 +98,10 @@ static void on_configuration_key_changed (ModestConf* conf, ModestConfEvent event, ModestMainWindow *self); +static void +set_toolbar_mode (ModestMainWindow *self, + ModestToolBarModes mode); + /* list my signals */ enum { /* MY_SIGNAL_1, */ @@ -90,6 +109,7 @@ enum { LAST_SIGNAL }; + typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate; struct _ModestMainWindowPrivate { GtkWidget *msg_paned; @@ -97,10 +117,24 @@ struct _ModestMainWindowPrivate { GtkWidget *main_vbox; GtkWidget *contents_widget; + /* Progress observers */ + GtkWidget *progress_bar; + GSList *progress_widgets; + + /* Tollbar items */ + GtkWidget *progress_toolitem; + GtkWidget *cancel_toolitem; + GtkWidget *sort_toolitem; + GtkWidget *refresh_toolitem; + ModestToolBarModes current_toolbar_mode; + /* On-demand widgets */ GtkWidget *accounts_popup; GtkWidget *details_widget; + /* Optimized view enabled */ + gboolean optimized_view; + ModestHeaderView *header_view; ModestFolderView *folder_view; @@ -137,6 +171,12 @@ static const GtkActionEntry modest_folder_view_action_entries [] = { { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, NULL }, }; + +static const GtkToggleActionEntry modest_main_window_toggle_action_entries [] = { + { "ToolbarToggleView", MODEST_STOCK_SPLIT_VIEW, N_("gqn_toolb_rss_fldonoff"), "t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view), FALSE }, +}; + + /************************************************************************/ GType @@ -196,6 +236,12 @@ modest_main_window_init (ModestMainWindow *obj) priv->accounts_popup = NULL; priv->details_widget = NULL; + priv->optimized_view = FALSE; + + priv->progress_widgets = NULL; + priv->progress_bar = NULL; + priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL; + priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT; priv->contents_style = MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS; } @@ -203,6 +249,12 @@ modest_main_window_init (ModestMainWindow *obj) static void modest_main_window_finalize (GObject *obj) { + ModestMainWindowPrivate *priv; + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj); + + g_slist_free (priv->progress_widgets); + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -244,11 +296,11 @@ restore_sizes (ModestMainWindow *self) conf = modest_runtime_get_conf (); modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), - "modest-main-paned"); + MODEST_CONF_MAIN_PANED_KEY); modest_widget_memory_restore (conf, G_OBJECT(priv->header_view), - "header-view"); + MODEST_CONF_HEADER_VIEW_KEY); modest_widget_memory_restore (conf, G_OBJECT(self), - "modest-main-window"); + MODEST_CONF_MAIN_WINDOW_KEY); } @@ -261,10 +313,12 @@ save_sizes (ModestMainWindow *self) priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); conf = modest_runtime_get_conf (); - modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window"); - modest_widget_memory_save (conf, G_OBJECT(priv->main_paned), - "modest-main-paned"); - modest_widget_memory_save (conf, G_OBJECT(priv->header_view), "header-view"); + modest_widget_memory_save (conf,G_OBJECT(self), + MODEST_CONF_MAIN_WINDOW_KEY); + modest_widget_memory_save (conf, G_OBJECT(priv->main_paned), + MODEST_CONF_MAIN_PANED_KEY); + modest_widget_memory_save (conf, G_OBJECT(priv->header_view), + MODEST_CONF_HEADER_VIEW_KEY); } static void @@ -286,6 +340,20 @@ on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) return FALSE; } + +static void +on_connection_changed (TnyDevice *device, gboolean online, ModestMainWindow *self) +{ + /* When going online, do the equivalent of pressing the send/receive button, + * as per the specification: + * (without the check for >0 accounts, though that is not specified): */ + if (online) { + do_send_receive (MODEST_WINDOW (self)); + } +} + + + static void connect_signals (ModestMainWindow *self) { @@ -326,6 +394,12 @@ connect_signals (ModestMainWindow *self) NULL); g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self); + /* Mail Operation Queue */ + g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), + "queue-changed", + G_CALLBACK (on_queue_changed), + self); + /* Track changes in the device name */ g_signal_connect (G_OBJECT(modest_runtime_get_conf ()), "key_changed", @@ -337,16 +411,58 @@ connect_signals (ModestMainWindow *self) "account_update", G_CALLBACK (on_account_update), self); -} + /* Device */ + g_signal_connect (G_OBJECT(modest_runtime_get_device()), "connection_changed", + G_CALLBACK(on_connection_changed), self); +} +/** Idle handler, to send/receive at startup .*/ gboolean sync_accounts_cb (ModestMainWindow *win) { - modest_ui_actions_on_send_receive (NULL, MODEST_WINDOW(win)); - return FALSE; + do_send_receive (MODEST_WINDOW(win)); + return FALSE; /* Do not call this idle handler again. */ } +static void on_hildon_program_is_topmost_notify(GObject *self, + GParamSpec *propert_param, gpointer user_data) +{ + HildonProgram *app = HILDON_PROGRAM (self); + + /* + ModestWindow* self = MODEST_WINDOW(user_data); + */ + + /* Note that use of hildon_program_set_can_hibernate() + * is generally referred to as "setting the killable flag", + * though hibernation does not seem equal to death. + * murrayc */ + + if (hildon_program_get_is_topmost (app)) { + /* Prevent hibernation when the progam comes to the foreground, + * because hibernation should only happen when the application + * is in the background: */ + hildon_program_set_can_hibernate (app, FALSE); + } else { + /* Allow hibernation if the program has gone to the background: */ + + /* However, prevent hibernation while the settings are being changed: */ + gboolean settings_dialog_is_open = FALSE; + + if (settings_dialog_is_open) + hildon_program_set_can_hibernate (app, FALSE); + else { + + /* Allow hibernation, after saving the state: */ + modest_osso_save_state(); + hildon_program_set_can_hibernate (app, TRUE); + } + } + +} + + ModestWindow* modest_main_window_new (void) @@ -386,6 +502,11 @@ modest_main_window_new (void) G_N_ELEMENTS (modest_toggle_action_entries), self); + gtk_action_group_add_toggle_actions (action_group, + modest_main_window_toggle_action_entries, + G_N_ELEMENTS (modest_main_window_toggle_action_entries), + self); + gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0); g_object_unref (action_group); @@ -421,8 +542,12 @@ modest_main_window_new (void) TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED); priv->folder_view = MODEST_FOLDER_VIEW(modest_folder_view_new (query)); if (!priv->folder_view) - g_printerr ("modest: cannot instantiate folder view\n"); - g_object_unref (G_OBJECT (query)); + g_printerr ("modest: cannot instantiate folder view\n"); + g_object_unref (G_OBJECT (query)); + modest_folder_view_set_style (priv->folder_view, + MODEST_FOLDER_VIEW_STYLE_SHOW_ONE); + + /* Get device name */ modest_maemo_utils_get_device_name (); /* header view */ @@ -469,11 +594,31 @@ modest_main_window_new (void) /* Set account store */ tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view), TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); - g_idle_add ((GSourceFunc)sync_accounts_cb, self); - /* do send & receive when we are idle */ + /* do send & receive when we are idle */ + g_idle_add ((GSourceFunc)sync_accounts_cb, self); + + HildonProgram *app = hildon_program_get_instance (); + hildon_program_add_window (app, HILDON_WINDOW (self)); + /* Register HildonProgram signal handlers: */ + /* These are apparently deprecated, according to the + * "HildonApp/HildonAppView to HildonProgram/HildonWindow migration guide", + * though the API reference does not mention that: + * + g_signal_connect (G_OBJECT(app), "topmost_status_lose", + G_CALLBACK (on_hildon_program_save_state), self); + g_signal_connect (G_OBJECT(app), "topmost_status_acquire", + G_CALLBACK (on_hildon_program_status_acquire), self); + */ + g_signal_connect (G_OBJECT(app), "notify::is-topmost", + G_CALLBACK (on_hildon_program_is_topmost_notify), self); + + /* Load previous osso state, for instance if we are being restored from + * hibernation: */ + modest_osso_load_state(); + return MODEST_WINDOW(self); } @@ -499,20 +644,27 @@ modest_main_window_close_all (ModestMainWindow *self) return FALSE; } + void modest_main_window_set_style (ModestMainWindow *self, ModestMainWindowStyle style) { ModestMainWindowPrivate *priv; + ModestWindowPrivate *parent_priv; + GtkAction *action; g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); /* no change -> nothing to do */ if (priv->style == style) return; + /* Get toggle button */ + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarToggleView"); + priv->style = style; switch (style) { @@ -524,6 +676,10 @@ modest_main_window_set_style (ModestMainWindow *self, /* Reparent the contents widget to the main vbox */ gtk_widget_reparent (priv->contents_widget, priv->main_vbox); + g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); + g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self); + break; case MODEST_MAIN_WINDOW_STYLE_SPLIT: /* Remove header view */ @@ -533,6 +689,11 @@ modest_main_window_set_style (ModestMainWindow *self, /* Reparent the main paned */ gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->contents_widget); gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned); + + g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE); + g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self); + break; default: g_return_if_reached (); @@ -559,6 +720,8 @@ modest_main_window_get_style (ModestMainWindow *self) return priv->style; } + + static gboolean modest_main_window_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer userdata) { @@ -598,18 +761,51 @@ static void modest_main_window_show_toolbar (ModestWindow *self, gboolean show_toolbar) { - ModestWindowPrivate *parent_priv; + ModestMainWindowPrivate *priv = NULL; + ModestWindowPrivate *parent_priv = NULL; GtkWidget *reply_button = NULL, *menu = NULL; - + GtkWidget *placeholder = NULL; + gint insert_index; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); parent_priv = MODEST_WINDOW_GET_PRIVATE(self); - if (!parent_priv->toolbar && show_toolbar) { + /* Set optimized view status */ + priv->optimized_view = !show_toolbar; + + if (!parent_priv->toolbar) { parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); /* Set homogeneous toolbar */ gtk_container_foreach (GTK_CONTAINER (parent_priv->toolbar), set_homogeneous, NULL); + + priv->progress_toolitem = GTK_WIDGET (gtk_tool_item_new ()); + priv->cancel_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarCancel"); + priv->refresh_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive"); + priv->sort_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSort"); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE); + + /* Add ProgressBar (Transfer toolbar) */ + priv->progress_bar = modest_progress_bar_widget_new (); + gtk_widget_set_no_show_all (priv->progress_bar, TRUE); + placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ProgressBarView"); + insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder)); + gtk_container_add (GTK_CONTAINER (priv->progress_toolitem), priv->progress_bar); + gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (priv->progress_toolitem), insert_index); + + /* Connect cancel 'clicked' signal to abort progress mode */ + g_signal_connect(priv->cancel_toolitem, "clicked", + G_CALLBACK(cancel_progressbar), + self); + + /* Add it to the observers list */ + priv->progress_widgets = g_slist_prepend(priv->progress_widgets, priv->progress_bar); /* Add to window */ hildon_window_add_toolbar (HILDON_WINDOW (self), @@ -627,15 +823,20 @@ modest_main_window_show_toolbar (ModestWindow *self, NULL, self); } - - if (show_toolbar) + if (show_toolbar) { + /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */ + /* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */ + gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE); + gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); - else + set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL); + } else gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); + } /* - * TODO: modify the menu dinamically. Add handlers to each item of the + * TODO: modify the menu dynamically. Add handlers to each item of the * menu when created */ static void @@ -660,8 +861,13 @@ on_account_update (TnyAccountStore *account_store, if (!parent_priv->toolbar) return; - if (priv->accounts_popup) + if (priv->accounts_popup && gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup)) ) { + /* gtk_menu_detach will also unreference the popup, + * so we can forget about this instance, and create a new one later: + */ gtk_menu_detach (GTK_MENU (priv->accounts_popup)); + priv->accounts_popup = NULL; + } /* Get accounts */ account_list = tny_simple_list_new (); @@ -689,19 +895,28 @@ on_account_update (TnyAccountStore *account_store, default_account = modest_account_mgr_get_default_account (mgr); do { - TnyAccount *acc; - const gchar *acc_name; - gchar *display_name; + TnyAccount *acc = NULL; + const gchar *acc_name = NULL; /* Create tool item */ acc = TNY_ACCOUNT (tny_iterator_get_current (iter)); - acc_name = tny_account_get_name (acc); + if (acc) + acc_name = tny_account_get_name (acc); /* Create display name */ - if (!strcmp (default_account, acc_name)) - display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), acc_name); + gchar *display_name = NULL; + if (acc_name) { + if (default_account && !(strcmp (default_account, acc_name) == 0)) + display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), acc_name); + else + display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), acc_name); + } else - display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), acc_name); + { + /* TODO: This probably should never happen: */ + display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), ""); + } + item = gtk_menu_item_new_with_label (display_name); @@ -937,3 +1152,168 @@ on_configuration_key_changed (ModestConf* conf, g_list_free (children); } } + +static void +set_toolbar_mode (ModestMainWindow *self, + ModestToolBarModes mode) +{ + ModestWindowPrivate *parent_priv = NULL; + ModestMainWindowPrivate *priv = NULL; + GtkAction *sort_action = NULL, *refresh_action = NULL, *cancel_action = NULL; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); + + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + + g_return_if_fail (GTK_IS_TOOLBAR(parent_priv->toolbar)); + + sort_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSort"); + refresh_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive"); + cancel_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarCancel"); + + /* Sets current toolbar mode */ + priv->current_toolbar_mode = mode; + + /* Show and hide toolbar items */ + switch (mode) { + case TOOLBAR_MODE_NORMAL: + if (sort_action) + gtk_action_set_visible (sort_action, TRUE); + if (refresh_action) + gtk_action_set_visible (refresh_action, TRUE); + if (priv->progress_toolitem) { + gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE); + gtk_widget_hide (priv->progress_toolitem); + } + if (priv->progress_bar) + gtk_widget_hide (priv->progress_bar); + + if (cancel_action) + gtk_action_set_visible (cancel_action, FALSE); + + /* Hide toolbar if optimized view is enabled */ + if (priv->optimized_view) + gtk_widget_hide (GTK_WIDGET(parent_priv->toolbar)); + break; + case TOOLBAR_MODE_TRANSFER: + if (sort_action) + gtk_action_set_visible (sort_action, FALSE); + if (refresh_action) + gtk_action_set_visible (refresh_action, FALSE); + if (cancel_action) + gtk_action_set_visible (cancel_action, TRUE); + if (priv->progress_toolitem) { + gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE); + gtk_widget_show (priv->progress_toolitem); + } + if (priv->progress_bar) + gtk_widget_show (priv->progress_bar); + + /* Show toolbar if it's hiden (optimized view ) */ + if (priv->optimized_view) + gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); + break; + default: + g_return_if_reached (); + } +} + +static void +cancel_progressbar (GtkToolButton *toolbutton, + ModestMainWindow *self) +{ + GSList *tmp; + ModestMainWindowPrivate *priv; + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + + /* Get operation observers and cancel its current operation */ + tmp = priv->progress_widgets; + while (tmp) { + modest_progress_object_cancel_current_operation (MODEST_PROGRESS_OBJECT(tmp->data)); + tmp=g_slist_next(tmp); + } +} + +static gboolean +observers_empty (ModestMainWindow *self) +{ + GSList *tmp = NULL; + ModestMainWindowPrivate *priv; + gboolean is_empty = TRUE; + guint pending_ops = 0; + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + tmp = priv->progress_widgets; + + /* Check all observers */ + while (tmp && is_empty) { + pending_ops = modest_progress_object_num_pending_operations (MODEST_PROGRESS_OBJECT(tmp->data)); + is_empty = pending_ops == 0; + + tmp = g_slist_next(tmp); + } + + return is_empty; +} + +static void +on_queue_changed (ModestMailOperationQueue *queue, + ModestMailOperation *mail_op, + ModestMailOperationQueueNotification type, + ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv; + ModestMailOperationId op_id; + ModestToolBarModes mode; + GSList *tmp; + gboolean mode_changed = FALSE; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + + /* Get toolbar mode from operation id*/ + op_id = modest_mail_operation_get_id (mail_op); + switch (op_id) { + case MODEST_MAIL_OPERATION_ID_SEND: + case MODEST_MAIL_OPERATION_ID_RECEIVE: + mode = TOOLBAR_MODE_TRANSFER; + if (priv->current_toolbar_mode == TOOLBAR_MODE_NORMAL) + mode_changed = TRUE; + break; + default: + mode = TOOLBAR_MODE_NORMAL; + + } + + + /* Add operation observers and change toolbar if neccessary*/ + tmp = priv->progress_widgets; + switch (type) { + case MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED: + if (mode_changed) + set_toolbar_mode (self, mode); + if (mode == TOOLBAR_MODE_TRANSFER) { + while (tmp) { + modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data), + mail_op); + tmp = g_slist_next (tmp); + } + } + break; + case MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED: + if (mode == TOOLBAR_MODE_TRANSFER) { + while (tmp) { + modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data), + mail_op); + tmp = g_slist_next (tmp); + } + + /* If no more operations are being observed, NORMAL mode is enabled again */ + if (observers_empty (self)) + set_toolbar_mode (self, TOOLBAR_MODE_NORMAL); + } + break; + } +}