* src/modest-attachments-view.c:

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

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index 392524d..93fce0c 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include "modest-window-mgr.h"
 #include "modest-runtime.h"
+#include "modest-tny-folder.h"
 #include "widgets/modest-main-window.h"
 #include "widgets/modest-msg-edit-window.h"
 #include "widgets/modest-msg-view-window.h"
@@ -294,6 +295,7 @@ compare_msguids (ModestWindow *win,
 
        /* Get message uid from msg window */
        msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
+
        if (msg_uid && !strcmp (msg_uid, uid))
                return 0;
        else
@@ -301,23 +303,28 @@ compare_msguids (ModestWindow *win,
 }
 
 ModestWindow*  
-modest_window_mgr_find_window_by_msguid (ModestWindowMgr *self, 
-                                        const gchar *msguid)
+modest_window_mgr_find_window_by_header (ModestWindowMgr *self, 
+                                        TnyHeader *header)
 {
        ModestWindowMgrPrivate *priv;
        GList *win = NULL;
+       gchar *msg_uid;
 
        g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
-       g_return_val_if_fail (msguid != NULL, NULL);
+       g_return_val_if_fail (TNY_IS_HEADER (header), NULL);
 
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       msg_uid = modest_tny_folder_get_header_unique_id (header);
 
        /* Look for the window */
        if (priv->window_list)
                win = g_list_find_custom (priv->window_list, 
-                                         msguid, 
+                                         msg_uid, 
                                          (GCompareFunc) compare_msguids);
+       /* Free */
+       g_free (msg_uid);
 
+       /* Return the window */
        if (win)
                return win->data;
        else 
@@ -430,7 +437,8 @@ on_nonhibernating_window_hide(GtkWidget *widget, gpointer user_data)
        
        /* Forget this window,
         * so hibernation will be allowed again if no windows are remembered: */
-       g_slist_remove (priv->windows_that_prevent_hibernation, GTK_WINDOW(widget));
+       priv->windows_that_prevent_hibernation =
+               g_slist_remove (priv->windows_that_prevent_hibernation, GTK_WINDOW(widget));
 }
 
 static void
@@ -495,5 +503,3 @@ void modest_window_mgr_save_state_for_all_windows (ModestWindowMgr *self)
                win = g_list_next (win);
        }
 }
-
-