Refactored the code that closes the active dialogs

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index a41f4ea..db458b6 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -1424,7 +1424,7 @@ on_idle_top_application (gpointer user_data)
 }
 #endif
 
 }
 #endif
 

-static gint 
+static gint

 on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
        /* Use g_idle to context-switch into the application's thread: */
 on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
        /* Use g_idle to context-switch into the application's thread: */

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index 36f7b3c..6daeef1 100644 (file)
--- 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-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"
 #include "modest-conf.h"
 #include "modest-defs.h"
 #include "modest-signal-mgr.h"

@@ -433,44 +434,16 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
        HildonWindowStack *stack;
        gboolean nested_msg = FALSE;
        ModestWindow *current_top;
        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);
 
 
        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);
 
        stack = hildon_window_stack_get_default ();
        current_top = (ModestWindow *) hildon_window_stack_peek (stack);

@@ -1077,4 +1050,3 @@ osso_display_event_cb (osso_display_state_t state,
        if (priv->display_state == OSSO_DISPLAY_ON)
                modest_platform_remove_new_mail_notifications (TRUE);
 }
        if (priv->display_state == OSSO_DISPLAY_ON)
                modest_platform_remove_new_mail_notifications (TRUE);
 }

-

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index a40d264..acd181b 100644 (file)
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -111,6 +111,7 @@ libmodest_widgets_la_SOURCES=          \
        modest-tny-stream-gtkhtml.h    \
        modest-validating-entry.c \
        modest-window.c                \
        modest-tny-stream-gtkhtml.h    \
        modest-validating-entry.c \
        modest-window.c                \

+       modest-window-mgr-priv.h        \

        modest-window-mgr.h            \
        modest-window-mgr.c            \
        modest-wizard-dialog.h         \
        modest-window-mgr.h            \
        modest-window-mgr.c            \
        modest-wizard-dialog.h         \

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 87848b7..1f08b45 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -1152,3 +1152,48 @@ modest_window_mgr_has_progress_operation_on_account (ModestWindowMgr *self,
        return account_ops;
 }
 
        return account_ops;
 }
 

+
+void
+_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 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;
+       }
+       return TRUE;
+}