Fixes for mailboxes window

[modest] / src / widgets / modest-window-mgr.c

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 1a27e00..64dfafd 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -76,6 +76,7 @@ static GList *modest_window_mgr_get_window_list_default (ModestWindowMgr *self);
 static ModestWindow *modest_window_mgr_show_initial_window_default (ModestWindowMgr *self);
 static ModestWindow *modest_window_mgr_get_current_top_default (ModestWindowMgr *self);
 static gboolean modest_window_mgr_screen_is_on_default (ModestWindowMgr *self);
+static ModestWindow *modest_window_mgr_get_folder_window_default (ModestWindowMgr *self);
 static void modest_window_mgr_create_caches_default (ModestWindowMgr *self);
 static void modest_window_mgr_on_queue_changed (ModestMailOperationQueue *queue,
                                                ModestMailOperation *mail_op,
@@ -85,6 +86,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 {
@@ -177,6 +179,8 @@ 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;
+       mgr_class->get_folder_window = modest_window_mgr_get_folder_window_default;
 
        g_type_class_add_private (gobject_class, sizeof(ModestWindowMgrPrivate));
 
@@ -1167,3 +1171,79 @@ modest_window_mgr_has_progress_operation_on_account (ModestWindowMgr *self,
        return account_ops;
 }
 
+/* 'Protected method' must be only called by children */
+gboolean
+_modest_window_mgr_close_active_modals (ModestWindowMgr *self)
+{
+       GtkWidget *modal;
+
+       /* Exit if there are no windows */
+       if (!modest_window_mgr_get_num_windows (self)) {
+               g_warning ("%s: there are no windows to close", __FUNCTION__);
+               return FALSE;
+       }
+
+       /* 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 defined(MODEST_TOOLKIT_HILDON2) || defined(MODEST_TOOLKIT_HILDON)
+#include <hildon/hildon.h>
+               /* 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;
+               }
+#endif
+
+               /* 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;
+       }
+       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;
+}
+
+ModestWindow *
+modest_window_mgr_get_folder_window (ModestWindowMgr *self)
+{
+       return MODEST_WINDOW_MGR_GET_CLASS (self)->get_folder_window (self);
+}
+
+static ModestWindow *
+modest_window_mgr_get_folder_window_default (ModestWindowMgr *self)
+{
+       /* Default implementation returns NULL always */
+
+       return NULL;
+}
+