Close the edit mode after running move to dialog, not before.
[modest] / src / hildon2 / modest-hildon2-window-mgr.c
index 2b05222..b6618de 100644 (file)
@@ -29,6 +29,7 @@
 
 #include <string.h>
 #include <hildon/hildon.h>
+#include "modest-hildon2-window.h"
 #include "modest-hildon2-window-mgr.h"
 #include "modest-msg-edit-window.h"
 #include "modest-mailboxes-window.h"
@@ -78,6 +79,9 @@ static void modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self,
 static gboolean modest_hildon2_window_mgr_find_registered_header (ModestWindowMgr *self, 
                                                                  TnyHeader *header,
                                                                  ModestWindow **win);
+static gboolean modest_hildon2_window_mgr_find_registered_message_uid (ModestWindowMgr *self, 
+                                                                      const gchar *msg_uid,
+                                                                      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 window_can_close (ModestWindow *window);
@@ -163,6 +167,7 @@ modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass)
        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->show_initial_window = modest_hildon2_window_mgr_show_initial_window;
@@ -372,6 +377,38 @@ modest_hildon2_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHead
        return has_header || has_window;
 }
 
+static gboolean
+modest_hildon2_window_mgr_find_registered_message_uid (ModestWindowMgr *self, const gchar *msg_uid,
+                                                      ModestWindow **win)
+{
+       ModestHildon2WindowMgrPrivate *priv = NULL;
+       gboolean has_header, has_window = FALSE;
+       GList *item = NULL;
+
+       g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE);
+       g_return_val_if_fail (msg_uid && msg_uid[0] != '\0', FALSE);
+       
+       priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
+
+       has_header = MODEST_WINDOW_MGR_CLASS (parent_class)->find_registered_message_uid (self, msg_uid, win);
+       
+       item = g_list_find_custom (priv->window_list, msg_uid, (GCompareFunc) compare_msguids);
+       if (item) {
+               has_window = TRUE;
+               if (win) {
+                       if ((!MODEST_IS_MSG_VIEW_WINDOW(item->data)) && 
+                           (!MODEST_IS_MSG_EDIT_WINDOW (item->data)))
+                               g_debug ("not a valid window!");
+                       else {
+                               g_debug ("found a window");
+                               *win = MODEST_WINDOW (item->data);
+                       }
+               }
+       }
+       
+       return has_header || has_window;
+}
+
 static GList *
 modest_hildon2_window_mgr_get_window_list (ModestWindowMgr *self)
 {
@@ -394,12 +431,36 @@ 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;
+
+               /* 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;
+       }
+
        stack = hildon_window_stack_get_default ();
        current_top = (ModestWindow *) hildon_window_stack_peek (stack);
 
@@ -411,6 +472,12 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
                return FALSE;
        }
 
+       /* Do not allow standalone editors or standalone viewers */
+       if (!current_top &&
+           (MODEST_IS_MSG_VIEW_WINDOW (window) ||
+            MODEST_IS_MSG_EDIT_WINDOW (window)))
+               modest_window_mgr_show_initial_window (self);
+
        if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
                gchar *uid;
                TnyHeader *header;
@@ -535,7 +602,9 @@ cancel_window_operations (ModestWindow *window)
                GSList* tmp_list = NULL;
 
                type = modest_mail_operation_get_type_operation (MODEST_MAIL_OPERATION (pending_ops->data));
-               if (type == MODEST_MAIL_OPERATION_TYPE_RECEIVE || type == MODEST_MAIL_OPERATION_TYPE_OPEN) {
+               if (type == MODEST_MAIL_OPERATION_TYPE_RECEIVE ||
+                   type == MODEST_MAIL_OPERATION_TYPE_OPEN ||
+                   type == MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE) {
                        modest_mail_operation_cancel (pending_ops->data);
                }
                g_object_unref (G_OBJECT (pending_ops->data));
@@ -766,32 +835,56 @@ modest_hildon2_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show)
                gtk_widget_show_all (GTK_WIDGET (result));
                gtk_window_present (GTK_WINDOW (result));
        }
-       
+
        return result;
 }
 
+static gint
+look_for_transient (gconstpointer a,
+                   gconstpointer b)
+{
+       GtkWindow *win, *child;
+
+       if (a == b)
+               return 1;
+
+       child = (GtkWindow *) b;
+       win = (GtkWindow *) a;
+
+       if (gtk_window_get_transient_for (win) == child)
+               return 0;
+       else
+               return 1;
+}
 
 static GtkWindow *
 modest_hildon2_window_mgr_get_modal (ModestWindowMgr *self)
 {
        ModestHildon2WindowMgrPrivate *priv;
        GList *toplevel_list;
-       GtkWidget *toplevel;
-       
+       GtkWidget *current_top, *toplevel;
+       HildonWindowStack *stack;
+
        g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), NULL);
        priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
 
-       toplevel = NULL;
+       /* Get current top */
+       stack = hildon_window_stack_get_default ();
+       current_top = hildon_window_stack_peek (stack);
+       toplevel = current_top;
        toplevel_list = gtk_window_list_toplevels ();
-       while (toplevel_list) {
-               if (gtk_window_is_active (toplevel_list->data)) {
-                       toplevel = toplevel_list->data;
+
+       while (toplevel) {
+               GList *parent_link;
+
+               parent_link = g_list_find_custom (toplevel_list, toplevel, look_for_transient);
+               if (parent_link)
+                       toplevel = (GtkWidget *) parent_link->data;
+               else
                        break;
-               }
-               toplevel_list = g_list_next (toplevel_list);
        }
 
-       return NULL;
+       return (GtkWindow *) toplevel;
 }
 
 
@@ -809,6 +902,23 @@ modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self,
 }
 
 static void
+close_all_but_first (HildonWindowStack *stack)
+{
+       gint num_windows, i;
+       gboolean retval;
+
+       num_windows = hildon_window_stack_size (stack);
+
+       for (i = 0; i < (num_windows - 1); i++) {
+               GtkWidget *current_top;
+
+               /* Close window */
+               current_top = hildon_window_stack_peek (stack);
+               g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval);
+       }
+}
+
+static void
 on_account_removed (TnyAccountStore *acc_store, 
                    TnyAccount *account,
                    gpointer user_data)
@@ -836,8 +946,6 @@ on_account_removed (TnyAccountStore *acc_store,
                header_view = modest_header_window_get_header_view (MODEST_HEADER_WINDOW (current_top));
                folder = modest_header_view_get_folder (header_view);
                if (folder) {
-                       gboolean retval;
-
                        /* Close if it's my account */
                        if (!TNY_IS_MERGE_FOLDER (folder)) {
                                TnyAccount *my_account;
@@ -845,9 +953,7 @@ on_account_removed (TnyAccountStore *acc_store,
                                my_account = tny_folder_get_account (folder);
                                if (my_account) {
                                        if (my_account == account) {
-                                               g_signal_emit_by_name (G_OBJECT (current_top),
-                                                                      "delete-event",
-                                                                      NULL, &retval);
+                                               close_all_but_first (stack);
                                                deleted = TRUE;
                                        }
                                        g_object_unref (my_account);
@@ -857,17 +963,14 @@ on_account_removed (TnyAccountStore *acc_store,
                        /* Close if viewing outbox and no account left */
                        if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_OUTBOX) {
                                if (!has_accounts) {
-                                       g_signal_emit_by_name (G_OBJECT (current_top),
-                                                              "delete-event",
-                                                              NULL, &retval);
+                                       close_all_but_first (stack);
                                        deleted = TRUE;
                                }
                        }
                        g_object_unref (folder);
 
-                       if (deleted) {
+                       if (deleted)
                                current_top = (ModestWindow *) hildon_window_stack_peek (stack);
-                       }
                }
        }
 }