Fixes NB#110770, multiple subviews shown for an embedded attachment when clicking...

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

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index 2cfd9c3..2b05222 100644 (file)
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -31,6 +31,7 @@
 #include <hildon/hildon.h>
 #include "modest-hildon2-window-mgr.h"
 #include "modest-msg-edit-window.h"
+#include "modest-mailboxes-window.h"
 #include "modest-header-window.h"
 #include "modest-main-window.h"
 #include "modest-conf.h"
@@ -307,13 +308,34 @@ compare_msguids (ModestWindow *win,
        } else {
                msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
        }
-       
+
        if (msg_uid && uid &&!strcmp (msg_uid, uid))
                return 0;
        else
                return 1;
 }
 
+static gint
+compare_headers (ModestWindow *win,
+                TnyHeader *header)
+{
+       TnyHeader *my_header;
+       gint result = 1;
+
+       if (!MODEST_IS_MSG_VIEW_WINDOW (win))
+               return 1;
+
+       /* Get message uid from msg window */
+       my_header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));
+       if (my_header) {
+               if (my_header == header)
+                       result = 0;
+               g_object_unref (my_header);
+       }
+       return result;
+}
+
+
 static gboolean
 modest_hildon2_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHeader *header,
                                                  ModestWindow **win)
@@ -385,16 +407,63 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
        if (win) {
                /* this is for the case we want to register the window
                   and it was already registered */
-               gtk_window_present (GTK_WINDOW (win));
+               gtk_window_present (GTK_WINDOW (window));
                return FALSE;
        }
 
+       if (MODEST_IS_MSG_VIEW_WINDOW (window)) {
+               gchar *uid;
+               TnyHeader *header;
+               header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (window));
+
+               if (header) {
+                       uid = modest_tny_folder_get_header_unique_id (header);
+
+                       /* Embedded messages do not have uid */
+                       if (uid) {
+                               if (g_list_find_custom (priv->window_list, uid, (GCompareFunc) compare_msguids)) {
+                                       g_debug ("%s found another view window showing the same header", __FUNCTION__);
+                                       g_free (uid);
+                                       g_object_unref (header);
+                                       return FALSE;
+                               }
+                               g_free (uid);
+                       } else {
+                               if (g_list_find_custom (priv->window_list, header, (GCompareFunc) compare_headers)) {
+                                       g_debug ("%s found another view window showing the same header", __FUNCTION__);
+                                       g_object_unref (header);
+                                       return FALSE;
+                               }
+                       }
+                       g_object_unref (header);
+               }
+       }
+
        if (MODEST_IS_FOLDER_WINDOW (current_top) && MODEST_IS_FOLDER_WINDOW (window)) {
-               g_debug ("Trying to register a second folder window is not allowed");
+               gtk_window_present (GTK_WINDOW (window));
+               return FALSE;
+       }
+
+       if (MODEST_IS_MAILBOXES_WINDOW (current_top) && MODEST_IS_MAILBOXES_WINDOW (window)) {
+               gtk_window_present (GTK_WINDOW (window));
+               return FALSE;
+       }
+
+       /* Mailboxes window can not replace folder windows */
+       if (MODEST_IS_FOLDER_WINDOW (current_top) && MODEST_IS_MAILBOXES_WINDOW (window)) {
                gtk_window_present (GTK_WINDOW (current_top));
                return FALSE;
        }
 
+       /* Trying to open a folders window and a mailboxes window at
+          the same time from the accounts window is not allowed */
+       if (MODEST_IS_MAILBOXES_WINDOW (current_top) &&
+           MODEST_IS_FOLDER_WINDOW (window) &&
+           MODEST_IS_ACCOUNTS_WINDOW (parent)) {
+               gtk_window_present (GTK_WINDOW (window));
+               return FALSE;
+       }
+
        if (MODEST_IS_HEADER_WINDOW (current_top) && MODEST_IS_HEADER_WINDOW (window)) {
                g_debug ("Trying to register a second header window is not allowed");
                gtk_window_present (GTK_WINDOW (current_top));
@@ -408,7 +477,7 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
        g_object_ref (window);
        priv->window_list = g_list_prepend (priv->window_list, window);
 
-       nested_msg = MODEST_IS_MSG_VIEW_WINDOW (window) && 
+       nested_msg = MODEST_IS_MSG_VIEW_WINDOW (window) &&
                MODEST_IS_MSG_VIEW_WINDOW (parent);
 
        /* Close views if they're being shown. Nevertheless we must