From: Sergio Villar Senin Date: Fri, 23 Oct 2009 11:03:45 +0000 (+0200) Subject: Added close_all_but_initial() function call X-Git-Tag: 3.1.9~8 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=84d6cc86c65eda181a2683e206ae91faad73f807 Added close_all_but_initial() function call --- diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c index 6daeef1..74e3299 100644 --- a/src/hildon2/modest-hildon2-window-mgr.c +++ b/src/hildon2/modest-hildon2-window-mgr.c @@ -86,6 +86,7 @@ static gboolean modest_hildon2_window_mgr_find_registered_message_uid (ModestWin ModestWindow **win); static GList *modest_hildon2_window_mgr_get_window_list (ModestWindowMgr *self); static gboolean modest_hildon2_window_mgr_close_all_windows (ModestWindowMgr *self); +static gboolean modest_hildon2_window_mgr_close_all_but_initial (ModestWindowMgr *self); static gboolean window_has_modals (ModestWindow *window); static ModestWindow *modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self); static ModestWindow *modest_hildon2_window_mgr_get_current_top (ModestWindowMgr *self); @@ -172,6 +173,7 @@ modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass) mgr_class->find_registered_message_uid = modest_hildon2_window_mgr_find_registered_message_uid; mgr_class->get_window_list = modest_hildon2_window_mgr_get_window_list; mgr_class->close_all_windows = modest_hildon2_window_mgr_close_all_windows; + mgr_class->close_all_but_initial = modest_hildon2_window_mgr_close_all_but_initial; mgr_class->show_initial_window = modest_hildon2_window_mgr_show_initial_window; mgr_class->get_current_top = modest_hildon2_window_mgr_get_current_top; mgr_class->screen_is_on = modest_hildon2_window_mgr_screen_is_on; @@ -899,15 +901,15 @@ modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self, gtk_window_set_destroy_with_parent (window, TRUE); } -static gboolean -on_idle_close_all_but_first (gpointer data) +static void +close_all_but_first (gpointer data) { gint num_windows, i; gboolean retval; HildonWindowStack *stack; stack = hildon_window_stack_get_default (); - g_return_val_if_fail (stack, FALSE); + g_return_if_fail (stack); num_windows = hildon_window_stack_size (stack); @@ -918,6 +920,15 @@ on_idle_close_all_but_first (gpointer data) current_top = hildon_window_stack_peek (stack); g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval); } +} + +static gboolean +on_idle_close_all_but_first (gpointer data) +{ + gdk_threads_enter (); + close_all_but_first (data); + gdk_threads_leave (); + return FALSE; } @@ -1035,11 +1046,10 @@ modest_hildon2_window_mgr_create_caches (ModestWindowMgr *self) modest_accounts_window_pre_create (); MODEST_WINDOW_MGR_CLASS(parent_class)->create_caches (self); - } -static void -osso_display_event_cb (osso_display_state_t state, +static void +osso_display_event_cb (osso_display_state_t state, gpointer data) { ModestHildon2WindowMgrPrivate *priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (data); @@ -1050,3 +1060,35 @@ osso_display_event_cb (osso_display_state_t state, if (priv->display_state == OSSO_DISPLAY_ON) modest_platform_remove_new_mail_notifications (TRUE); } + +static gboolean +modest_hildon2_window_mgr_close_all_but_initial (ModestWindowMgr *self) +{ + ModestWindow *top; + + /* Exit if there are no windows */ + if (!modest_window_mgr_get_num_windows (self)) { + g_warning ("%s: unable to close, there are no windows", __FUNCTION__); + return FALSE; + } + + /* Close active modals */ + if (!_modest_window_mgr_close_active_modals (self)) { + g_debug ("%s: unable to close some dialogs", __FUNCTION__); + return FALSE; + } + + /* Close all but first */ + top = modest_window_mgr_get_current_top (self); + if (!MODEST_IS_ACCOUNTS_WINDOW (top)) + close_all_but_first (NULL); + + /* If some cannot be closed return */ + top = modest_window_mgr_get_current_top (self); + if (!MODEST_IS_ACCOUNTS_WINDOW (top)) { + g_debug ("%s: could not close some windows", __FUNCTION__); + return FALSE; + } + + return TRUE; +} diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c index 1f08b45..cb28697 100644 --- a/src/widgets/modest-window-mgr.c +++ b/src/widgets/modest-window-mgr.c @@ -83,6 +83,7 @@ static void on_mail_operation_started (ModestMailOperation *mail_op, gpointer user_data); static void on_mail_operation_finished (ModestMailOperation *mail_op, gpointer user_data); +static gboolean modest_window_mgr_close_all_but_initial_default (ModestWindowMgr *self); /* list my signals */ enum { @@ -172,6 +173,7 @@ modest_window_mgr_class_init (ModestWindowMgrClass *klass) mgr_class->get_current_top = modest_window_mgr_get_current_top_default; mgr_class->screen_is_on = modest_window_mgr_screen_is_on_default; mgr_class->create_caches = modest_window_mgr_create_caches_default; + mgr_class->close_all_but_initial = modest_window_mgr_close_all_but_initial_default; g_type_class_add_private (gobject_class, sizeof(ModestWindowMgrPrivate)); @@ -1152,8 +1154,8 @@ modest_window_mgr_has_progress_operation_on_account (ModestWindowMgr *self, return account_ops; } - -void +/* 'Protected method' must be only called by children */ +gboolean _modest_window_mgr_close_active_modals (ModestWindowMgr *self) { GtkWidget *modal; @@ -1169,6 +1171,8 @@ _modest_window_mgr_close_active_modals (ModestWindowMgr *self) while (modal && GTK_IS_DIALOG (modal)) { GtkWidget *parent; +#if defined(MODEST_TOOLKIT_HILDON2) || defined(MODEST_TOOLKIT_HILDON) +#include /* If it's a hildon note then don't try to close it as this is the default behaviour of WM, delete event is not issued for this kind of notes as we want the @@ -1177,6 +1181,7 @@ _modest_window_mgr_close_active_modals (ModestWindowMgr *self) gtk_window_present (GTK_WINDOW (modal)); return FALSE; } +#endif /* Get the parent */ parent = (GtkWidget *) gtk_window_get_transient_for (GTK_WINDOW (modal)); @@ -1197,3 +1202,16 @@ _modest_window_mgr_close_active_modals (ModestWindowMgr *self) } return TRUE; } + +gboolean +modest_window_mgr_close_all_but_initial (ModestWindowMgr *self) +{ + return MODEST_WINDOW_MGR_GET_CLASS (self)->close_all_but_initial (self); +} + +static gboolean +modest_window_mgr_close_all_but_initial_default (ModestWindowMgr *self) +{ + /* Empty default implementation */ + return FALSE; +} diff --git a/src/widgets/modest-window-mgr.h b/src/widgets/modest-window-mgr.h index 6e7fa12..7360e0d 100644 --- a/src/widgets/modest-window-mgr.h +++ b/src/widgets/modest-window-mgr.h @@ -82,8 +82,11 @@ struct _ModestWindowMgrClass { GList * (*get_window_list) (ModestWindowMgr *self); ModestWindow * (*show_initial_window) (ModestWindowMgr *self); ModestWindow * (*get_current_top) (ModestWindowMgr *self); + gboolean (*close_all_but_initial) (ModestWindowMgr *self); + gboolean (*screen_is_on) (ModestWindowMgr *self); void (*create_caches) (ModestWindowMgr *self); + /* Signals */ void (*window_list_empty) (ModestWindowMgr *self); void (*progress_list_changed) (ModestWindowMgr *self); @@ -474,6 +477,19 @@ gboolean modest_window_mgr_has_progress_operation_on_account (ModestWindowMgr *s */ void modest_window_mgr_create_caches (ModestWindowMgr *self); +/** + * modest_window_mgr_close_all_but_initial: + * @self: a #ModestWindowMgr + * + * closes all but the initial window. + * + * Returns: %TRUE if the initial window is returned in @initial_window + * and it does not have any other dialog or window on top, otherwhise + * %FALSE + */ +gboolean modest_window_mgr_close_all_but_initial (ModestWindowMgr *self); + + G_END_DECLS #endif /* __MODEST_WINDOW_MGR_H__ */