From b2534b195f441c6aec2ad21594f01d4b59160dac Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Tue, 14 Apr 2009 12:16:20 +0000 Subject: [PATCH] Fixes NB#110770, multiple subviews shown for an embedded attachment when clicking several times on it pmo-trunk-r8774 --- src/hildon2/modest-hildon2-window-mgr.c | 51 ++++++++++++++++++++++++++++++- src/hildon2/modest-msg-view-window.c | 6 ++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c index 499e467..2b05222 100644 --- a/src/hildon2/modest-hildon2-window-mgr.c +++ b/src/hildon2/modest-hildon2-window-mgr.c @@ -308,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) @@ -390,6 +411,34 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, 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)) { gtk_window_present (GTK_WINDOW (window)); return FALSE; diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c index aa34e70..0e5b87d 100644 --- a/src/hildon2/modest-msg-view-window.c +++ b/src/hildon2/modest-msg-view-window.c @@ -2557,8 +2557,10 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, mailbox, attachment_uid); modest_window_set_zoom (MODEST_WINDOW (msg_win), modest_window_get_zoom (MODEST_WINDOW (window))); - modest_window_mgr_register_window (mgr, msg_win, MODEST_WINDOW (window)); - gtk_widget_show_all (GTK_WIDGET (msg_win)); + if (modest_window_mgr_register_window (mgr, msg_win, MODEST_WINDOW (window))) + gtk_widget_show_all (GTK_WIDGET (msg_win)); + else + gtk_widget_destroy (GTK_WIDGET (msg_win)); } } -- 1.7.9.5