X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhildon2%2Fmodest-hildon2-window-mgr.c;h=60ab7c1788192b95891bae0df7922bed54a38d77;hb=514d7488390a9c4c31a9ca5e44f78dc9329b833d;hp=e5f8a565f23a8b37b6247ea7cf4a63fbc1fc82bb;hpb=e875e9075deae779e12903416a8f1f6c96cbdcc7;p=modest diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c index e5f8a56..60ab7c1 100644 --- a/src/hildon2/modest-hildon2-window-mgr.c +++ b/src/hildon2/modest-hildon2-window-mgr.c @@ -35,6 +35,7 @@ #include "modest-mailboxes-window.h" #include "modest-header-window.h" #include "modest-main-window.h" +#include "modest-window-mgr-priv.h" #include "modest-conf.h" #include "modest-defs.h" #include "modest-signal-mgr.h" @@ -72,7 +73,6 @@ static void modest_hildon2_window_mgr_show_toolbars (ModestWindowMgr *self, GType window_type, gboolean show_toolbars, gboolean fullscreen); -static ModestWindow* modest_hildon2_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show); static GtkWindow *modest_hildon2_window_mgr_get_modal (ModestWindowMgr *self); static void modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self, GtkWindow *window, @@ -85,6 +85,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); @@ -95,6 +96,7 @@ static void osso_display_event_cb (osso_display_state_t state, static void on_account_removed (TnyAccountStore *acc_store, TnyAccount *account, gpointer user_data); +static ModestWindow *modest_hildon2_window_mgr_get_folder_window (ModestHildon2WindowMgr *self); typedef struct _ModestHildon2WindowMgrPrivate ModestHildon2WindowMgrPrivate; struct _ModestHildon2WindowMgrPrivate { @@ -164,17 +166,18 @@ modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass) mgr_class->set_fullscreen_mode = modest_hildon2_window_mgr_set_fullscreen_mode; mgr_class->get_fullscreen_mode = modest_hildon2_window_mgr_get_fullscreen_mode; mgr_class->show_toolbars = modest_hildon2_window_mgr_show_toolbars; - mgr_class->get_main_window = modest_hildon2_window_mgr_get_main_window; mgr_class->get_modal = modest_hildon2_window_mgr_get_modal; mgr_class->set_modal = modest_hildon2_window_mgr_set_modal; mgr_class->find_registered_header = modest_hildon2_window_mgr_find_registered_header; 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; mgr_class->create_caches = modest_hildon2_window_mgr_create_caches; + mgr_class->get_folder_window = modest_hildon2_window_mgr_get_folder_window; g_type_class_add_private (gobject_class, sizeof(ModestHildon2WindowMgrPrivate)); @@ -261,9 +264,6 @@ modest_hildon2_window_mgr_finalize (GObject *obj) } g_mutex_free (priv->queue_lock); - /* Do not unref priv->main_window because it does not hold a - new reference */ - G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -433,44 +433,16 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, HildonWindowStack *stack; gboolean nested_msg = FALSE; ModestWindow *current_top; - GtkWidget *modal; g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE); g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self); - /* Check that there is no active modal dialog */ - modal = (GtkWidget *) modest_window_mgr_get_modal (self); - while (modal && GTK_IS_DIALOG (modal)) { - GtkWidget *parent; - - /* 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 - user to always click on a button */ - if (HILDON_IS_NOTE (modal)) { - gtk_window_present (GTK_WINDOW (modal)); - return FALSE; - } - - /* Get the parent */ - parent = (GtkWidget *) gtk_window_get_transient_for (GTK_WINDOW (modal)); - - /* Try to close it */ - gtk_dialog_response (GTK_DIALOG (modal), GTK_RESPONSE_DELETE_EVENT); - - /* Maybe the dialog was not closed, because a close - confirmation dialog for example. Then ignore the - register process */ - if (GTK_IS_WINDOW (modal)) { - gtk_window_present (GTK_WINDOW (modal)); - return FALSE; - } - - /* Get next modal */ - modal = parent; - } + /* Try to close active modal dialogs */ + if (modest_window_mgr_get_num_windows (self) && + !_modest_window_mgr_close_active_modals (self)) + return FALSE; stack = hildon_window_stack_get_default (); current_top = (ModestWindow *) hildon_window_stack_peek (stack); @@ -823,12 +795,6 @@ modest_hildon2_window_mgr_show_toolbars (ModestWindowMgr *self, return; } -static ModestWindow* -modest_hildon2_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show) -{ - return NULL; -} - static gint look_for_transient (gconstpointer a, gconstpointer b) @@ -895,15 +861,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); @@ -914,6 +880,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; } @@ -994,7 +969,7 @@ find_folder_window (gconstpointer a, return (MODEST_IS_FOLDER_WINDOW (a)) ? 0 : 1; } -ModestWindow * +static ModestWindow * modest_hildon2_window_mgr_get_folder_window (ModestHildon2WindowMgr *self) { ModestHildon2WindowMgrPrivate *priv; @@ -1031,11 +1006,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); @@ -1047,3 +1021,34 @@ osso_display_event_cb (osso_display_state_t state, 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; +}