* src/modest-tny-local-folders-account.c,

[modest] / src / dbus_api / modest-dbus-callbacks.c

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index e551240..9832c3c 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -537,8 +537,11 @@ find_msg_async_cb (TnyFolder *folder,
                 }
 
                if (msg_view != NULL) {
-                       modest_window_mgr_register_window (win_mgr, msg_view);
-                       gtk_widget_show_all (GTK_WIDGET (msg_view));
+                       if (!modest_window_mgr_register_window (win_mgr, msg_view, NULL)) {
+                               gtk_widget_destroy (GTK_WIDGET (msg_view));
+                       } else {
+                               gtk_widget_show_all (GTK_WIDGET (msg_view));
+                       }
                }
         }
 
@@ -1158,6 +1161,11 @@ on_idle_top_application (gpointer user_data)
 
        gdk_threads_enter (); /* CHECKED */
        
+#ifdef MODEST_TOOLKIT_HILDON2
+       main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+                                                     TRUE);
+       new_window = TRUE;
+#else
        main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
                                                      FALSE);
 
@@ -1166,13 +1174,9 @@ on_idle_top_application (gpointer user_data)
                                                              TRUE);
                new_window = TRUE;
        }
+#endif
 
        if (main_win) {
-               /* Ideally, we would just use gtk_widget_show(), 
-                * but this widget is not coded correctly to support that: */
-               gtk_widget_show_all (GTK_WIDGET (main_win));
-               gtk_window_present (GTK_WINDOW (main_win));
-
                /* If we're showing an already existing window then
                   reselect the INBOX */
                if (!new_window) {
@@ -1183,6 +1187,13 @@ on_idle_top_application (gpointer user_data)
                }
        }
 
+#ifndef MODEST_TOOLKIT_HILDON2
+       if (main_win) {
+               gtk_widget_show_all (GTK_WIDGET (main_win));
+               gtk_window_present (GTK_WINDOW (main_win));
+       }
+#endif
+
        gdk_threads_leave (); /* CHECKED */
        
        return FALSE; /* Do not call this callback again. */