* modest-outside-scratchbox patch 2:

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

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index caf781e..47ec037 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -36,6 +36,7 @@
 #include "widgets/modest-main-window.h"
 #include "widgets/modest-msg-edit-window.h"
 #include "widgets/modest-msg-view-window.h"
+#include "modest-debug.h"
 
 
 /* 'private'/'protected' functions */
@@ -83,6 +84,10 @@ struct _ModestWindowMgrPrivate {
        guint        closing_time;
 
        GSList       *modal_handler_uids;
+       GtkWidget    *cached_view;
+       GtkWidget    *cached_editor;
+       guint        idle_load_view_id;
+       guint        idle_load_editor_id;
 };
 #define MODEST_WINDOW_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_WINDOW_MGR, \
@@ -146,6 +151,42 @@ modest_window_mgr_class_init (ModestWindowMgrClass *klass)
                              G_TYPE_NONE, 0);
 }
 
+static gboolean
+idle_load_view (ModestWindowMgr *mgr)
+{
+       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (mgr);
+       
+       priv->cached_view = g_object_new (MODEST_TYPE_MSG_VIEW_WINDOW, NULL);
+       priv->idle_load_view_id = 0;
+       return FALSE;
+}
+
+static gboolean
+idle_load_editor (ModestWindowMgr *mgr)
+{
+       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (mgr);
+       
+       priv->cached_editor = g_object_new (MODEST_TYPE_MSG_EDIT_WINDOW, NULL);
+       priv->idle_load_editor_id = 0;
+       return FALSE;
+}
+
+static void
+load_new_view (ModestWindowMgr *self)
+{
+       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       if ((priv->cached_view == NULL) && (priv->idle_load_view_id == 0))
+               priv->idle_load_view_id = g_idle_add ((GSourceFunc) idle_load_view, self);
+}
+
+static void
+load_new_editor (ModestWindowMgr *self)
+{
+       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       if ((priv->cached_editor == NULL) && (priv->idle_load_editor_id == 0))
+               priv->idle_load_editor_id = g_idle_add ((GSourceFunc) idle_load_editor, self);
+}
+
 static void
 modest_window_mgr_init (ModestWindowMgr *obj)
 {
@@ -169,6 +210,8 @@ modest_window_mgr_init (ModestWindowMgr *obj)
        priv->closing_time = 0;
 
        priv->modal_handler_uids = NULL;
+       priv->cached_view = NULL;
+       priv->cached_editor = NULL;
 }
 
 static void
@@ -176,6 +219,25 @@ modest_window_mgr_finalize (GObject *obj)
 {
        ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(obj);
 
+       if (priv->idle_load_view_id > 0) {
+               g_source_remove (priv->idle_load_view_id);
+               priv->idle_load_view_id = 0;
+       }
+       
+       if (priv->idle_load_editor_id > 0) {
+               g_source_remove (priv->idle_load_editor_id);
+               priv->idle_load_editor_id = 0;
+       }
+       
+       if (priv->cached_view) {
+               gtk_widget_destroy (priv->cached_view);
+               priv->cached_view = NULL;
+       }
+       if (priv->cached_editor) {
+               gtk_widget_destroy (priv->cached_editor);
+               priv->cached_editor = NULL;
+       }
+
        if (priv->window_list) {
                GList *iter = priv->window_list;
                /* unregister pending windows */
@@ -506,8 +568,9 @@ modest_window_mgr_register_window (ModestWindowMgr *self,
 
        win = g_list_find (priv->window_list, window);
        if (win) {
-               g_warning ("%s: trying to re-register a window",
-                          __FUNCTION__);
+               /* this is for the case we want to register the window and it was already
+                * registered. We leave silently.
+                */
                return;
        }
        
@@ -519,6 +582,8 @@ modest_window_mgr_register_window (ModestWindowMgr *self,
                        return;
                } else {
                        priv->main_window = window;
+                       load_new_view (self);
+                       load_new_editor (self);
                }
        }
 
@@ -591,6 +656,9 @@ on_window_destroy (ModestWindow *window,
                /* If more than one window already opened */
                if (g_list_length (priv->window_list) > 1) {
 
+                       /* Present the window if it's not visible now */
+                       if (!gtk_window_has_toplevel_focus (GTK_WINDOW (window)))
+                               gtk_window_present (GTK_WINDOW (window));
                        /* Create the confirmation dialog MSG-NOT308 */
                        dialog_response = modest_platform_run_confirmation_dialog (
                                        GTK_WINDOW (window), _("emev_nc_close_windows"));
@@ -838,7 +906,9 @@ modest_window_mgr_get_main_window (ModestWindowMgr *self, gboolean create)
        if (!priv->main_window && create) {
                /* modest_window_mgr_register_window will set priv->main_window */
                modest_window_mgr_register_window (self, modest_main_window_new ());
-               g_debug ("%s: created main window: %p\n", __FUNCTION__, priv->main_window);
+               MODEST_DEBUG_BLOCK(
+                       g_debug ("%s: created main window: %p\n", __FUNCTION__, priv->main_window);
+               );
        }
        
        return priv->main_window;
@@ -1083,3 +1153,37 @@ modest_window_mgr_num_windows (ModestWindowMgr *self)
 
        return num_windows;
 }
+
+GtkWidget *   
+modest_window_mgr_get_msg_edit_window (ModestWindowMgr *self)
+{
+       GtkWidget *result;
+       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
+
+       if (priv->cached_editor) {
+               result = priv->cached_editor;
+               priv->cached_editor = NULL;
+               load_new_editor (self);
+       } else {
+               result = g_object_new (MODEST_TYPE_MSG_EDIT_WINDOW, NULL);
+       }
+
+       return result;
+}
+
+GtkWidget *   
+modest_window_mgr_get_msg_view_window (ModestWindowMgr *self)
+{
+       GtkWidget *result;
+       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
+
+       if (priv->cached_view) {
+               result = priv->cached_view;
+               priv->cached_view = NULL;
+               load_new_view (self);
+       } else {
+               result = g_object_new (MODEST_TYPE_MSG_VIEW_WINDOW, NULL);
+       }
+
+       return result;
+}