* Fixes NB#90762, initialize and free a private field
[modest] / src / widgets / modest-window-mgr.c
index ca27a2c..6da29ad 100644 (file)
 #include "widgets/modest-main-window.h"
 #include "widgets/modest-msg-edit-window.h"
 #include "widgets/modest-msg-view-window.h"
-/* include other impl specific header files */
+#include "modest-debug.h"
+
 
 /* 'private'/'protected' functions */
 static void modest_window_mgr_class_init (ModestWindowMgrClass *klass);
 static void modest_window_mgr_init       (ModestWindowMgr *obj);
 static void modest_window_mgr_finalize   (GObject *obj);
 
-/* static void on_window_destroy            (ModestWindow *window,  */
-/*                                       ModestWindowMgr *self); */
-static gboolean on_window_destroy            (ModestWindow *window,
-                                             GdkEvent *event,
-                                             ModestWindowMgr *self);
+static gboolean modest_window_mgr_register_window_default (ModestWindowMgr *self, 
+                                                          ModestWindow *window,
+                                                          ModestWindow *parent);
+static void modest_window_mgr_unregister_window_default (ModestWindowMgr *self, 
+                                                        ModestWindow *window);
+static void modest_window_mgr_set_fullscreen_mode_default (ModestWindowMgr *self,
+                                                          gboolean on);
+static gboolean modest_window_mgr_get_fullscreen_mode_default (ModestWindowMgr *self);
+static void modest_window_mgr_show_toolbars_default (ModestWindowMgr *self,
+                                                    GType window_type,
+                                                    gboolean show_toolbars,
+                                                    gboolean fullscreen);
+static ModestWindow* modest_window_mgr_get_main_window_default (ModestWindowMgr *self, gboolean show);
+static GtkWindow *modest_window_mgr_get_modal_default (ModestWindowMgr *self);
+static void modest_window_mgr_set_modal_default (ModestWindowMgr *self, 
+                                                GtkWindow *window,
+                                                GtkWindow *parent);
+static gboolean modest_window_mgr_close_all_windows_default (ModestWindowMgr *self);
+static gboolean modest_window_mgr_find_registered_header_default (ModestWindowMgr *self, 
+                                                                 TnyHeader *header,
+                                                                 ModestWindow **win);
+static GList *modest_window_mgr_get_window_list_default (ModestWindowMgr *self);
 
 /* list my signals  */
 enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
+       WINDOW_LIST_EMPTY_SIGNAL,
+       NUM_SIGNALS
 };
 
 typedef struct _ModestWindowMgrPrivate ModestWindowMgrPrivate;
 struct _ModestWindowMgrPrivate {
-       GList        *window_list;
+       guint         banner_counter;
+
        ModestWindow *main_window;
-       gboolean     fullscreen_mode;
-       gboolean     show_toolbars;
-       gboolean     show_toolbars_fullscreen;
-       
+
        GSList       *windows_that_prevent_hibernation;
        GSList       *preregistered_uids;
-       GHashTable   *destroy_handlers;
+       
+       guint        closing_time;
+
+       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, \
                                                ModestWindowMgrPrivate))
@@ -75,7 +97,7 @@ struct _ModestWindowMgrPrivate {
 static GObjectClass *parent_class = NULL;
 
 /* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
+static guint signals[NUM_SIGNALS] = {0};
 
 GType
 modest_window_mgr_get_type (void)
@@ -105,12 +127,79 @@ static void
 modest_window_mgr_class_init (ModestWindowMgrClass *klass)
 {
        GObjectClass *gobject_class;
+       ModestWindowMgrClass *mgr_class;
+
        gobject_class = (GObjectClass*) klass;
+       mgr_class = (ModestWindowMgrClass *) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_window_mgr_finalize;
+       mgr_class->register_window = modest_window_mgr_register_window_default;
+       mgr_class->unregister_window = modest_window_mgr_unregister_window_default;
+       mgr_class->set_fullscreen_mode = modest_window_mgr_set_fullscreen_mode_default;
+       mgr_class->get_fullscreen_mode = modest_window_mgr_get_fullscreen_mode_default;
+       mgr_class->show_toolbars = modest_window_mgr_show_toolbars_default;
+       mgr_class->get_main_window = modest_window_mgr_get_main_window_default;
+       mgr_class->get_modal = modest_window_mgr_get_modal_default;
+       mgr_class->set_modal = modest_window_mgr_set_modal_default;
+       mgr_class->close_all_windows = modest_window_mgr_close_all_windows_default;
+       mgr_class->find_registered_header = modest_window_mgr_find_registered_header_default;
+       mgr_class->get_window_list = modest_window_mgr_get_window_list_default;
 
        g_type_class_add_private (gobject_class, sizeof(ModestWindowMgrPrivate));
+
+
+       /**
+        * ModestWindowMgr::window-list-empty
+        * @self: the #ModestWindowMgr that emits the signal
+        * @user_data: user data set when the signal handler was connected
+        *
+        * Issued whenever the window list becomes empty
+        */
+       signals[WINDOW_LIST_EMPTY_SIGNAL] =
+               g_signal_new ("window-list-empty",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestWindowMgrClass, window_list_empty),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__VOID,
+                             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
@@ -119,17 +208,17 @@ modest_window_mgr_init (ModestWindowMgr *obj)
        ModestWindowMgrPrivate *priv;
 
        priv = MODEST_WINDOW_MGR_GET_PRIVATE(obj);
-       priv->window_list = NULL;
+       priv->banner_counter = 0;
        priv->main_window = NULL;
-       priv->fullscreen_mode = FALSE;
 
        priv->preregistered_uids = NULL;
 
-       /* Could not initialize it from gconf, singletons are not
-          ready yet */
-       priv->show_toolbars = FALSE;
-       priv->show_toolbars_fullscreen = FALSE;
-       priv->destroy_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
+       priv->closing_time = 0;
+
+       priv->cached_view = NULL;
+       priv->cached_editor = NULL;
+
+       priv->windows_that_prevent_hibernation = NULL;
 }
 
 static void
@@ -137,30 +226,32 @@ modest_window_mgr_finalize (GObject *obj)
 {
        ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(obj);
 
-       if (priv->window_list) {
-               GList *iter = priv->window_list;
-               /* unregister pending windows */
-               while (iter) {
-                       modest_window_mgr_unregister_window (MODEST_WINDOW_MGR (obj), 
-                                                            MODEST_WINDOW (iter->data));
-                       iter = g_list_next (iter);
-               }
-               g_list_free (priv->window_list);
-               priv->window_list = NULL;
+       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;
        }
-
-       g_slist_foreach (priv->preregistered_uids, (GFunc)g_free, NULL);
-       g_slist_free (priv->preregistered_uids);
-
        
-       /* Free the hash table with the handlers */
-       if (priv->destroy_handlers) {
-               g_hash_table_destroy (priv->destroy_handlers);
-               priv->destroy_handlers = NULL;
+       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->windows_that_prevent_hibernation) {
+               g_slist_free (priv->windows_that_prevent_hibernation);
+               priv->cached_editor = NULL;
        }
 
-       /* Do not unref priv->main_window because it does not hold a
-          new reference */
+       g_slist_foreach (priv->preregistered_uids, (GFunc)g_free, NULL);
+       g_slist_free (priv->preregistered_uids);
 
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
@@ -199,7 +290,7 @@ remove_uid (GSList *list, const gchar *uid)
        GSList *cursor = list, *start = list;
        
        if (!uid)
-               return FALSE;
+               return list;
        
        while (cursor) {
                GSList *next = g_slist_next (cursor);
@@ -222,7 +313,7 @@ append_uid (GSList *list, const gchar *uid)
 
 
 void 
-modest_window_mgr_register_header (ModestWindowMgr *self,  TnyHeader *header)
+modest_window_mgr_register_header (ModestWindowMgr *self,  TnyHeader *header, const gchar *alt_uid)
 {
        ModestWindowMgrPrivate *priv;
        gchar* uid;
@@ -232,10 +323,16 @@ modest_window_mgr_register_header (ModestWindowMgr *self,  TnyHeader *header)
                
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
        uid = modest_tny_folder_get_header_unique_id (header);
+
+       if (uid == NULL)
+               uid = g_strdup (alt_uid);
        
-       if (!has_uid (priv->preregistered_uids, uid))
+       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);
-
+       } else
+               MODEST_DEBUG_BLOCK(g_debug ("already had uid %s", uid););
+       
        g_free (uid);
 }
 
@@ -250,41 +347,78 @@ modest_window_mgr_unregister_header (ModestWindowMgr *self,  TnyHeader *header)
                
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
        uid = modest_tny_folder_get_header_unique_id (header);
+
+       if (!has_uid (priv->preregistered_uids, uid)) {
+               MODEST_DEBUG_BLOCK(g_debug ("trying to unregister non-existing uid %s", uid););
+               priv->preregistered_uids = append_uid (priv->preregistered_uids, uid);
+       } else
+               MODEST_DEBUG_BLOCK(g_debug ("unregistering uid %s", uid););
        
-       if (has_uid (priv->preregistered_uids, uid))
+       if (has_uid (priv->preregistered_uids, uid)) {
                priv->preregistered_uids = remove_uid (priv->preregistered_uids, uid);
-
+               if (has_uid (priv->preregistered_uids, uid))
+                       g_debug ("BUG: uid %s NOT removed", uid);
+               else
+                       MODEST_DEBUG_BLOCK(g_debug ("uid %s removed", uid););
+       }
+               
        g_free (uid);
 }
 
-static gint
-compare_msguids (ModestWindow *win,
-                const gchar *uid)
-{
-       const gchar *msg_uid;
 
-       if (!MODEST_IS_MSG_VIEW_WINDOW (win))
-               return 1;
+#define MODEST_WINDOW_HELP_ID_PARAM "help-id"
+
+void
+modest_window_mgr_register_help_id (ModestWindowMgr *self, GtkWindow *win, const gchar* help_id)
+{
+       /* we don't need 'self', but for API consistency... */
+       g_return_if_fail (self && MODEST_IS_WINDOW_MGR(self));
 
-       /* Get message uid from msg window */
-       msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
+       g_return_if_fail (win && GTK_IS_WINDOW(win));
+       g_return_if_fail (help_id);
        
-       if (msg_uid && uid &&!strcmp (msg_uid, uid))
-               return 0;
-       else
-               return 1;
+       g_object_set_data_full (G_OBJECT(win), MODEST_WINDOW_HELP_ID_PARAM,
+                               g_strdup(help_id), g_free);
 }
 
 
+const gchar*
+modest_window_mgr_get_help_id (ModestWindowMgr *self, GtkWindow *win)
+{
+       /* we don't need 'self', but for API consistency... */
+       g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR (self), NULL);
+       g_return_val_if_fail (win, NULL);
+
+       return g_object_get_data (G_OBJECT(win), MODEST_WINDOW_HELP_ID_PARAM);
+}
+
+gboolean
+modest_window_mgr_close_all_windows (ModestWindowMgr *self)
+{
+       return MODEST_WINDOW_MGR_GET_CLASS (self)->close_all_windows (self);
+}
+
+static gboolean
+modest_window_mgr_close_all_windows_default (ModestWindowMgr *self)
+{
+       return TRUE;
+}
+
 
 gboolean
 modest_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHeader *header,
-                                         ModestWindow **win)
+                                                 ModestWindow **win)
 {
-       ModestWindowMgrPrivate *priv;
-       gchar* uid;
-       gboolean retval = FALSE;
-       GList *item = NULL;
+       return MODEST_WINDOW_MGR_GET_CLASS (self)->find_registered_header (self, header, win);
+}
+
+static gboolean
+modest_window_mgr_find_registered_header_default (ModestWindowMgr *self, TnyHeader *header,
+                                                 ModestWindow **win)
+{
+       ModestWindowMgrPrivate *priv = NULL;
+       gchar* uid = NULL;
+       gboolean has_header = FALSE;
 
        g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
        g_return_val_if_fail (TNY_IS_HEADER(header), FALSE);
@@ -293,313 +427,238 @@ modest_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHeader *head
 
        uid = modest_tny_folder_get_header_unique_id (header);
        
-       /* first, look for the window */
-       /* note, the UID cannot be in both the window list and the preregistered uid list */
-       if (priv->window_list) {
-               item = g_list_find_custom (priv->window_list, 
-                                          uid, (GCompareFunc) compare_msguids);
-               if (item) 
-                       retval = TRUE;
-               if (win)
-                       *win = item ? MODEST_WINDOW(item->data) : NULL;
-       }
-       
-
-       /* IF It's not in the window list. maybe it's in our uid list... */
-       retval = retval || has_uid (priv->preregistered_uids, uid);
+       if (win)
+               *win = NULL;
 
-       g_free (uid);
+       has_header = has_uid (priv->preregistered_uids, uid);
 
-       return retval;
+       return has_header;
 }
 
+GList *
+modest_window_mgr_get_window_list (ModestWindowMgr *self)
+{
+       return MODEST_WINDOW_MGR_GET_CLASS (self)->get_window_list (self);
+}
 
+static GList *
+modest_window_mgr_get_window_list_default (ModestWindowMgr *self)
+{
+       return NULL;
+}
 
-void 
+gboolean
 modest_window_mgr_register_window (ModestWindowMgr *self, 
-                                  ModestWindow *window)
+                                  ModestWindow *window,
+                                  ModestWindow *parent)
+{
+       return MODEST_WINDOW_MGR_GET_CLASS (self)->register_window (self, window, parent);
+}
+
+static gboolean
+modest_window_mgr_register_window_default (ModestWindowMgr *self, 
+                                          ModestWindow *window,
+                                          ModestWindow *parent)
 {
-       static gboolean first_time = TRUE;
-       GList *win;
-       gboolean show;
        ModestWindowMgrPrivate *priv;
-       gint *handler_id;
 
-       g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
-       g_return_if_fail (MODEST_IS_WINDOW (window));
+       g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
+       g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
-       win = g_list_find (priv->window_list, window);
-       if (win) {
-               g_warning ("Trying to register an already registered window");
-               return;
-       }
-
        /* Check that it's not a second main window */
        if (MODEST_IS_MAIN_WINDOW (window)) {
                if (priv->main_window) {
-                       g_warning ("Trying to register a second main window");
-                       return;
+                       g_warning ("%s: trying to register a second main window",
+                                  __FUNCTION__);
+                       return FALSE;
                } else {
                        priv->main_window = window;
+                       load_new_view (self);
+                       load_new_editor (self);
                }
        }
 
        /* remove from the list of pre-registered uids */
        if (MODEST_IS_MSG_VIEW_WINDOW(window)) {
+               const gchar *uid = modest_msg_view_window_get_message_uid
+                       (MODEST_MSG_VIEW_WINDOW (window));
+
+               if (!has_uid (priv->preregistered_uids, uid)) 
+                       g_debug ("weird: no uid for window (%s)", uid);
+               
+               MODEST_DEBUG_BLOCK(g_debug ("registering window for %s", uid ? uid : "<none>"););
+               
                priv->preregistered_uids = 
                        remove_uid (priv->preregistered_uids,
                                    modest_msg_view_window_get_message_uid
                                    (MODEST_MSG_VIEW_WINDOW (window)));
-       }
-       
-       /* Add to list. Keep a reference to the window */
-       g_object_ref (window);
-       priv->window_list = g_list_prepend (priv->window_list, window);
-
-       /* Listen to object destruction */
-       handler_id = g_malloc0 (sizeof (gint));
-       *handler_id = g_signal_connect (window, "delete-event", G_CALLBACK (on_window_destroy), self);
-/*     *handler_id = g_signal_connect (window, "destroy", G_CALLBACK (on_window_destroy), self); */
-       g_hash_table_insert (priv->destroy_handlers, window, handler_id);
-
-       /* Put into fullscreen if needed */
-       if (priv->fullscreen_mode)
-               gtk_window_fullscreen (GTK_WINDOW (window));
-
-       /* Fill caches */
-       if (first_time) {
-               ModestConf *conf = modest_runtime_get_conf ();
-               priv->show_toolbars = 
-                       modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR, NULL);
-               priv->show_toolbars_fullscreen = 
-                       modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL);
-               first_time = FALSE;
-       }
-
-       /* Show/hide toolbar */
-       if (priv->fullscreen_mode)
-               show = priv->show_toolbars_fullscreen;
-       else
-               show = priv->show_toolbars;
-       modest_window_show_toolbar (window, show);
-}
+       } else if (MODEST_IS_MSG_EDIT_WINDOW(window)) {
+               const gchar *uid = modest_msg_edit_window_get_message_uid
+                       (MODEST_MSG_EDIT_WINDOW (window));
+               
+               MODEST_DEBUG_BLOCK(g_debug ("registering window for %s", uid););
 
-/* static void */
-/* on_window_destroy (ModestWindow *window, ModestWindowMgr *self) */
-static gboolean
-on_window_destroy (ModestWindow *window, 
-                  GdkEvent *event,
-                  ModestWindowMgr *self)
-{
-       /* Specific stuff first */
-       if (MODEST_IS_MAIN_WINDOW (window)) {
-               ModestWindowMgrPrivate *priv;
-               priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-
-               /* If more than one window already opened */
-               if (g_list_length (priv->window_list) > 1) {
-
-                       /* If the user wants to close all the windows */
-                       if (modest_main_window_close_all (MODEST_MAIN_WINDOW (window))) {
-                               GList *iter = priv->window_list;
-                               do {
-                                       if (iter->data != window) {
-                                               GList *tmp = iter->next;
-                                               on_window_destroy (MODEST_WINDOW (iter->data),
-                                                                  event,
-                                                                  self);
-                                               iter = tmp;
-                                       } else {
-                                               iter = g_list_next (iter);
-                                       }
-                               } while (iter);
-                       }
-               }
-       }
-       else {
-               if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
-                       gboolean sent = FALSE;
-                       gint response = GTK_RESPONSE_ACCEPT;
-                       sent = modest_msg_edit_window_get_sent (MODEST_MSG_EDIT_WINDOW (window));
-                       /* Save currently edited message to Drafts if it was not sent */
-                       if (!sent && modest_msg_edit_window_is_modified (MODEST_MSG_EDIT_WINDOW (window))) {
-                               
-                               response =
-                                       modest_platform_run_yes_no_dialog (GTK_WINDOW (window),
-                                                                          _("mcen_nc_no_email_message_modified_save_changes"));
-                               /* Save to drafts */
-                               if (response != GTK_RESPONSE_NO)                                
-                                       modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window));
-                               
-                       }
-               }
+               priv->preregistered_uids = 
+                       remove_uid (priv->preregistered_uids,
+                                   modest_msg_edit_window_get_message_uid
+                                   (MODEST_MSG_EDIT_WINDOW (window)));
        }
 
-       /* Save configuration state (TODO: why edit window does not require this function ?) */
-       if (!MODEST_IS_MSG_EDIT_WINDOW (window)) 
-               modest_window_save_state (MODEST_WINDOW(window));
-
-
-       /* Unregister window */
-       modest_window_mgr_unregister_window (self, window);
-       
-       return FALSE;
+       return TRUE;
 }
 
 void 
 modest_window_mgr_unregister_window (ModestWindowMgr *self, 
                                     ModestWindow *window)
 {
-       GList *win;
+       MODEST_WINDOW_MGR_GET_CLASS (self)->unregister_window (self, window);
+}
+
+static void 
+modest_window_mgr_unregister_window_default (ModestWindowMgr *self, 
+                                            ModestWindow *window)
+{
        ModestWindowMgrPrivate *priv;
-       gint *tmp, handler_id;
 
        g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
        g_return_if_fail (MODEST_IS_WINDOW (window));
 
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
-       win = g_list_find (priv->window_list, window);
-       if (!win) {
-               g_warning ("Trying to unregister a window that has not being registered yet");
-               return;
-       }
-
-       /* If it's the main window unset it */
-       if (priv->main_window == window)
-               priv->main_window = NULL;
-
        /* Save state */
        modest_window_save_state (window);
 
-       /* Remove from list & hash table */
-       priv->window_list = g_list_remove_link (priv->window_list, win);
-       tmp = g_hash_table_lookup (priv->destroy_handlers, window);
-       handler_id = *tmp;
-       g_hash_table_remove (priv->destroy_handlers, window);
-
-       /* Remove the reference to the window. Disconnect also the
-          delete-event handler, we won't need it anymore */
-       g_signal_handler_disconnect (window, handler_id);
-       gtk_widget_destroy (win->data);
-
-       /* If there are no more windows registered then exit program */
-       if (priv->window_list == NULL) {
-               ModestConf *conf = modest_runtime_get_conf ();
-
-               /* Save show toolbar status */
-               modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, 
-                                     priv->show_toolbars_fullscreen, NULL);
-               modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR, 
-                                     priv->show_toolbars, NULL);
-
-               /* Quit main loop */
-               /* FIXME: do we ever need to do this here? */
-               if (gtk_main_level() > 0)
-                       gtk_main_quit ();
-       }
+       /* Disconnect all the window signals */
+       modest_window_disconnect_signals (window);
+       
+       /* Destroy the window */
+       gtk_widget_destroy (GTK_WIDGET (window));
 }
 
+
+
 void
 modest_window_mgr_set_fullscreen_mode (ModestWindowMgr *self,
                                       gboolean on)
 {
-       ModestWindowMgrPrivate *priv;
-       GList *win = NULL;
-
-       g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
-
-       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-
-       /* If there is no change do nothing */
-       if (priv->fullscreen_mode == on)
-               return;
-
-       priv->fullscreen_mode = on;
+       MODEST_WINDOW_MGR_GET_CLASS (self)->set_fullscreen_mode (self, on);
+}
 
-       /* Update windows */
-       win = priv->window_list;
-       while (win) {
-               if (on) {
-                       gtk_window_fullscreen (GTK_WINDOW (win->data));
-                       modest_window_show_toolbar (MODEST_WINDOW (win->data), 
-                                                   priv->show_toolbars_fullscreen);
-               } else {
-                       gtk_window_unfullscreen (GTK_WINDOW (win->data));
-                       modest_window_show_toolbar (MODEST_WINDOW (win->data), 
-                                                   priv->show_toolbars);
-               }
-               win = g_list_next (win);
-       }
+static void
+modest_window_mgr_set_fullscreen_mode_default (ModestWindowMgr *self,
+                                              gboolean on)
+{
+       return;
 }
 
 gboolean
 modest_window_mgr_get_fullscreen_mode (ModestWindowMgr *self)
 {
-       ModestWindowMgrPrivate *priv;
-
-       g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
-
-       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       return MODEST_WINDOW_MGR_GET_CLASS (self)->get_fullscreen_mode (self);
+}
 
-       return priv->fullscreen_mode;
+static gboolean
+modest_window_mgr_get_fullscreen_mode_default (ModestWindowMgr *self)
+{
+       return FALSE;
 }
 
 void 
 modest_window_mgr_show_toolbars (ModestWindowMgr *self,
+                                GType window_type,
                                 gboolean show_toolbars,
                                 gboolean fullscreen)
 {
-       ModestWindowMgrPrivate *priv;
+       return MODEST_WINDOW_MGR_GET_CLASS (self)->show_toolbars (self, window_type, show_toolbars, fullscreen);
+}
+
+static void 
+modest_window_mgr_show_toolbars_default (ModestWindowMgr *self,
+                                        GType window_type,
+                                        gboolean show_toolbars,
+                                        gboolean fullscreen)
+{
+       return;
+}
 
+void
+modest_window_mgr_set_main_window (ModestWindowMgr *self, ModestWindow *win)
+{
+       ModestWindowMgrPrivate *priv;
+       
        g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
 
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       priv->main_window = win;
+}
 
-       /* If nothing changes then return. Otherwise cache it, do not
-          save to GConf for the moment, it will be done when all
-          windows become unregistered in order to avoid unnecessary
-          ModestConf calls */
-       if (fullscreen) {
-               if (priv->show_toolbars_fullscreen == show_toolbars)
-                       return;
-               else
-                       priv->show_toolbars_fullscreen = show_toolbars;
-       } else {
-               if (priv->show_toolbars == show_toolbars)
-                       return;
-               else
-                       priv->show_toolbars = show_toolbars;
-       }
+ModestWindow*  
+modest_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show)
+{
+       return MODEST_WINDOW_MGR_GET_CLASS (self)->get_main_window (self, show);
+}
 
-       /* Apply now if the view mode is the right one */
-       if ((fullscreen && priv->fullscreen_mode) ||
-           (!fullscreen && !priv->fullscreen_mode)) {
+static ModestWindow*  
+modest_window_mgr_get_main_window_default (ModestWindowMgr *self, gboolean show)
+{
+       ModestWindowMgrPrivate *priv;
+       
+       g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
 
-               GList *win = priv->window_list;
+       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       if (priv->main_window)
+               return priv->main_window;
 
-               while (win) {
-                       modest_window_show_toolbar (MODEST_WINDOW (win->data),
-                                                   show_toolbars);
-                       win = g_list_next (win);
-               }
-       }
+       if (show) 
+               return modest_main_window_new ();
+       else return NULL;
 }
 
-ModestWindow*  
-modest_window_mgr_get_main_window (ModestWindowMgr *self)
+
+gboolean
+modest_window_mgr_main_window_exists  (ModestWindowMgr *self)
 {
        ModestWindowMgrPrivate *priv;
+       
+       g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
+       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
-       g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
+       return priv->main_window != NULL;
+}
 
-       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
 
-       return priv->main_window;
+GtkWindow *
+modest_window_mgr_get_modal (ModestWindowMgr *self)
+{
+       return MODEST_WINDOW_MGR_GET_CLASS (self)->get_modal (self);
 }
 
+static GtkWindow *
+modest_window_mgr_get_modal_default (ModestWindowMgr *self)
+{
+       return NULL;
+}
+
+
+void
+modest_window_mgr_set_modal (ModestWindowMgr *self, 
+                            GtkWindow *window,
+                            GtkWindow *parent)
+{
+       MODEST_WINDOW_MGR_GET_CLASS (self)->set_modal (self, window, parent);
+}
+
+static void
+modest_window_mgr_set_modal_default (ModestWindowMgr *self, 
+                                    GtkWindow *window,
+                                    GtkWindow *parent)
+{
+       return;
+}
+
+
 static void
 on_nonhibernating_window_hide(GtkWidget *widget, gpointer user_data)
 {
@@ -628,7 +687,8 @@ on_nonhibernating_window_show(GtkWidget *widget, gpointer user_data)
                G_CALLBACK (on_nonhibernating_window_hide), self);
 }
 
-void modest_window_mgr_prevent_hibernation_while_window_is_shown (ModestWindowMgr *self,
+void
+modest_window_mgr_prevent_hibernation_while_window_is_shown (ModestWindowMgr *self,
                                                                  GtkWindow *window)
 {
        g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
@@ -642,7 +702,8 @@ void modest_window_mgr_prevent_hibernation_while_window_is_shown (ModestWindowMg
        }
 }
 
-gboolean modest_window_mgr_get_hibernation_is_prevented (ModestWindowMgr *self)
+gboolean
+modest_window_mgr_get_hibernation_is_prevented (ModestWindowMgr *self)
 {
        g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
        
@@ -654,22 +715,117 @@ gboolean modest_window_mgr_get_hibernation_is_prevented (ModestWindowMgr *self)
 }
 
 
-void modest_window_mgr_save_state_for_all_windows (ModestWindowMgr *self)
+void
+modest_window_mgr_save_state_for_all_windows (ModestWindowMgr *self)
 {
+       GList *window_list;
+       GList *node;
        g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
        
-       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-
        /* Iterate over all windows */
-       GList *win = priv->window_list;
-       while (win) {
-               ModestWindow *window = MODEST_WINDOW (win->data);
+       window_list = modest_window_mgr_get_window_list (self);
+       node = window_list;
+       while (node) {
+               ModestWindow *window = MODEST_WINDOW (node->data);
                if (window) {
                        /* This calls the vfunc, 
                         * so each window can do its own thing: */
                        modest_window_save_state (window);
                }       
                
-               win = g_list_next (win);
+               node = g_list_next (node);
+       }
+       g_list_free (window_list);
+}
+
+gint 
+modest_window_mgr_num_windows (ModestWindowMgr *self)
+{
+       ModestWindowMgrPrivate *priv;
+       gint num_windows = 0;
+       GList *window_list;
+
+       g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR(self), -1);
+       
+       priv =  MODEST_WINDOW_MGR_GET_PRIVATE(self);
+
+       window_list = modest_window_mgr_get_window_list (self);
+       
+       if (window_list) {
+               num_windows = g_list_length (window_list);
+               g_list_free (window_list);
+       }
+
+       /* Do not take into account the main window if it was hidden */
+       if (priv->main_window && !GTK_WIDGET_VISIBLE (priv->main_window))
+               num_windows--;
+
+       return num_windows + priv->banner_counter;
+}
+
+GtkWidget *   
+modest_window_mgr_get_msg_edit_window (ModestWindowMgr *self)
+{
+       GtkWidget *result;
+       ModestWindowMgrPrivate *priv;
+
+       g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR(self), NULL);
+
+       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;
+
+       g_return_val_if_fail (self && MODEST_IS_WINDOW_MGR(self), NULL);
+       
+       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;
+}
+
+void           
+modest_window_mgr_register_banner (ModestWindowMgr *self)
+{
+       ModestWindowMgrPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+       priv->banner_counter++;
+       
+}
+
+void           
+modest_window_mgr_unregister_banner (ModestWindowMgr *self)
+{
+       ModestWindowMgrPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+       priv->banner_counter--;
+       if (modest_window_mgr_num_windows (self) == 0)
+               g_signal_emit (self, signals[WINDOW_LIST_EMPTY_SIGNAL], 0);
 }