X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=9832c3c7a66af967dfe395addb2abdec6438a84f;hp=ee7d3bd4db29f5053d9e5f35f62e41df1d0a0269;hb=94bf2a181e8b2644f037246b2fc3a70c865c22e2;hpb=6f7aa1b5e15f3024db75ccfe3138f520c607dc5d

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index ee7d3bd..9832c3c 100644
--- 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, NULL);
-			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,6 +1174,7 @@ on_idle_top_application (gpointer user_data)
 							      TRUE);
 		new_window = TRUE;
 	}
+#endif
 
 	if (main_win) {
 		/* If we're showing an already existing window then
@@ -1178,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. */
@@ -1657,7 +1673,6 @@ add_folders_to_list (TnyFolderStore *folder_store, GList** list)
 	tny_folder_store_get_folders (folder_store,
 				      all_folders,
 				      NULL /* query */,
-				      FALSE,
 				      NULL /* error */);
 
 	TnyIterator *iter = tny_list_create_iterator (all_folders);