* Use osso_abook_aggregator_get_default to open the addressbook

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

diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c
index f4ab915..1a7e7f0 100644 (file)
--- a/src/widgets/modest-window-mgr.c
+++ b/src/widgets/modest-window-mgr.c
@@ -73,6 +73,7 @@ static GList *modest_window_mgr_get_window_list_default (ModestWindowMgr *self);
 static ModestWindow *modest_window_mgr_show_initial_window_default (ModestWindowMgr *self);
 static ModestWindow *modest_window_mgr_get_current_top_default (ModestWindowMgr *self);
 static gboolean modest_window_mgr_screen_is_on_default (ModestWindowMgr *self);
+static void modest_window_mgr_create_caches_default (ModestWindowMgr *self);
 static void modest_window_mgr_on_queue_changed (ModestMailOperationQueue *queue,
                                                ModestMailOperation *mail_op,
                                                ModestMailOperationQueueNotification type,
@@ -169,6 +170,7 @@ modest_window_mgr_class_init (ModestWindowMgrClass *klass)
        mgr_class->show_initial_window = modest_window_mgr_show_initial_window_default;
        mgr_class->get_current_top = modest_window_mgr_get_current_top_default;
        mgr_class->screen_is_on = modest_window_mgr_screen_is_on_default;
+       mgr_class->create_caches = modest_window_mgr_create_caches_default;
 
        g_type_class_add_private (gobject_class, sizeof(ModestWindowMgrPrivate));
 
@@ -231,7 +233,7 @@ 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);
+               priv->idle_load_view_id = g_timeout_add (2500, (GSourceFunc) idle_load_view, self);
 }
 
 static void
@@ -239,7 +241,7 @@ 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);
+               priv->idle_load_editor_id = g_timeout_add (5000, (GSourceFunc) idle_load_editor, self);
 }
 
 static void
@@ -379,11 +381,12 @@ modest_window_mgr_register_header (ModestWindowMgr *self,  TnyHeader *header, co
        g_return_if_fail (TNY_IS_HEADER(header));
                
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-       uid = modest_tny_folder_get_header_unique_id (header);
-
-       if (uid == NULL)
+       if (alt_uid != NULL) {
                uid = g_strdup (alt_uid);
-       
+       } else {
+               uid = modest_tny_folder_get_header_unique_id (header);
+       }
+
        if (!has_uid (priv->preregistered_uids, uid)) {
                MODEST_DEBUG_BLOCK(g_debug ("registering new uid %s", uid););
                priv->preregistered_uids = append_uid (priv->preregistered_uids, uid);
@@ -560,8 +563,6 @@ modest_window_mgr_register_window_default (ModestWindowMgr *self,
                        return FALSE;
                } else {
                        priv->main_window = window;
-                       load_new_view (self);
-                       load_new_editor (self);
                }
        }
 
@@ -972,6 +973,19 @@ modest_window_mgr_screen_is_on_default (ModestWindowMgr *self)
        return TRUE;
 }
 
+void
+modest_window_mgr_create_caches (ModestWindowMgr *mgr)
+{
+       MODEST_WINDOW_MGR_GET_CLASS (mgr)->create_caches (mgr);
+}
+
+static void
+modest_window_mgr_create_caches_default (ModestWindowMgr *self)
+{
+       load_new_editor (self);
+       load_new_view (self);
+}
+
 static gboolean
 tny_list_find (TnyList *list, GObject *item)
 {
@@ -1125,3 +1139,4 @@ modest_window_mgr_has_progress_operation_on_account (ModestWindowMgr *self,
 
        return account_ops;
 }
+