This fixes NB#75543.
[modest] / src / widgets / modest-window-mgr.c
index 3312baa..6c2f191 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 */
+
 
 /* '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 on_window_destroy        (ModestWindow *window,
+                                         GdkEvent *event,
+                                         ModestWindowMgr *self);
+
+static gboolean on_modal_window_close    (GtkWidget *widget,
+                                         GdkEvent *event,
+                                         gpointer user_data);
+
+static void     on_modal_dialog_close    (GtkDialog *dialog,
+                                         gint arg1,
+                                         gpointer user_data);
+
+static const gchar* get_show_toolbar_key (GType window_type,
+                                         gboolean fullscreen);
 
 /* 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;
+
        ModestWindow *main_window;
+
+       GMutex       *queue_lock;
+       GQueue       *modal_windows;
+       
        gboolean     fullscreen_mode;
-       gboolean     show_toolbars;
-       gboolean     show_toolbars_fullscreen;
        
        GSList       *windows_that_prevent_hibernation;
        GSList       *preregistered_uids;
        GHashTable   *destroy_handlers;
        GHashTable   *viewer_handlers;
+       
+       guint        closing_time;
+
+       GSList       *modal_handler_uids;
 };
 #define MODEST_WINDOW_MGR_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_WINDOW_MGR, \
@@ -76,7 +91,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)
@@ -112,6 +127,23 @@ modest_window_mgr_class_init (ModestWindowMgrClass *klass)
        gobject_class->finalize = modest_window_mgr_finalize;
 
        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 void
@@ -124,14 +156,19 @@ modest_window_mgr_init (ModestWindowMgr *obj)
        priv->main_window = NULL;
        priv->fullscreen_mode = FALSE;
 
+       priv->modal_windows = g_queue_new ();
+       priv->queue_lock = g_mutex_new ();
+       
        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->viewer_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, g_free);
+
+       priv->closing_time = 0;
+
+       priv->modal_handler_uids = NULL;
 }
 
 static void
@@ -166,9 +203,20 @@ modest_window_mgr_finalize (GObject *obj)
                priv->viewer_handlers = NULL;
        }
 
+       modest_signal_mgr_disconnect_all_and_destroy (priv->modal_handler_uids);
+
+       if (priv->modal_windows) {
+               g_mutex_lock (priv->queue_lock);
+               g_queue_free (priv->modal_windows);
+               priv->modal_windows = NULL;
+               g_mutex_unlock (priv->queue_lock);
+       }
+       g_mutex_free (priv->queue_lock);
+       
        /* Do not unref priv->main_window because it does not hold a
           new reference */
 
+       
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -229,7 +277,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;
@@ -239,10 +287,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)) {
+               g_debug ("registering new uid %s", uid);
                priv->preregistered_uids = append_uid (priv->preregistered_uids, uid);
-
+       } else
+               g_debug ("already had uid %s", uid);
+       
        g_free (uid);
 }
 
@@ -257,24 +311,94 @@ 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)) {
+               g_debug ("trying to unregister non-existing uid %s", uid);
+               priv->preregistered_uids = append_uid (priv->preregistered_uids, uid);
+       } else
+               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
+                       g_debug ("uid %s removed", uid);
+       }
+               
        g_free (uid);
 }
 
+
+#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));
+
+       g_return_if_fail (win && GTK_IS_WINDOW(win));
+       g_return_if_fail (help_id);
+       
+       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)
+{
+       const gchar* help_id = NULL;
+
+       /* 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);
+       g_return_val_if_fail (GTK_IS_WINDOW(win), NULL);
+       
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               GtkWidget *folder_view;
+               TnyFolderStore *folder_store;
+               
+               /* Get selected folder */
+               folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+               folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+               /* Switch help_id */
+               if (folder_store && TNY_IS_FOLDER (folder_store)) {
+                       help_id = modest_tny_folder_get_help_id (TNY_FOLDER (folder_store));
+                       if (!help_id)
+                               g_warning ("%s: BUG: did not get a valid help_id", __FUNCTION__);
+               }
+               if (folder_store)
+                       g_object_unref (folder_store);
+       }
+
+       if (!help_id)
+               help_id = g_object_get_data (G_OBJECT(win), MODEST_WINDOW_HELP_ID_PARAM);
+               
+       return help_id;
+}
+
 static gint
 compare_msguids (ModestWindow *win,
                 const gchar *uid)
 {
        const gchar *msg_uid;
 
-       if (!MODEST_IS_MSG_VIEW_WINDOW (win))
+       if ((!MODEST_IS_MSG_EDIT_WINDOW (win)) && (!MODEST_IS_MSG_VIEW_WINDOW (win)))
                return 1;
 
        /* Get message uid from msg window */
-       msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
+       if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
+               msg_uid = modest_msg_edit_window_get_message_uid (MODEST_MSG_EDIT_WINDOW (win));
+               if (msg_uid && uid &&!strcmp (msg_uid, uid))
+                       return 0;
+       } else {
+               msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
+       }
        
        if (msg_uid && uid &&!strcmp (msg_uid, uid))
                return 0;
@@ -282,15 +406,34 @@ compare_msguids (ModestWindow *win,
                return 1;
 }
 
+void
+modest_window_mgr_close_all_windows (ModestWindowMgr *self)
+{
+       ModestWindowMgrPrivate *priv = NULL;
+       GList *wins = NULL;
+       gboolean ret_value = FALSE;
+       
+       g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       
+       /* delete-event handler already removes window_list item, */
+       /* so no next its required on this loop  */
+       wins = priv->window_list;
+       while (wins) {          
+               g_signal_emit_by_name (G_OBJECT (wins->data), "delete-event", NULL, &ret_value);
+
+               wins = priv->window_list;
+       }
+}
 
 
 gboolean
 modest_window_mgr_find_registered_header (ModestWindowMgr *self, TnyHeader *header,
                                          ModestWindow **win)
 {
-       ModestWindowMgrPrivate *priv;
-       gchar* uid;
-       gboolean retval = FALSE;
+       ModestWindowMgrPrivate *priv = NULL;
+       gchar* uid = NULL;
+       gboolean has_header, has_window = FALSE;
        GList *item = NULL;
 
        g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
@@ -300,53 +443,80 @@ 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;
 
+       has_header = has_uid (priv->preregistered_uids, uid);
+       
+       item = g_list_find_custom (priv->window_list, uid, (GCompareFunc) compare_msguids);
+       if (item) {
+               has_window = TRUE;
+               if (win) {
+                       if ((!MODEST_IS_MSG_VIEW_WINDOW(item->data)) && 
+                           (!MODEST_IS_MSG_EDIT_WINDOW (item->data)))
+                               g_debug ("not a valid window!");
+                       else {
+                               g_debug ("found a window");
+                               *win = MODEST_WINDOW (item->data);
+                       }
+               }
+       }
        g_free (uid);
-
-       return retval;
+       
+       return has_header || has_window;
 }
 
+static const gchar *
+get_show_toolbar_key (GType window_type,
+                     gboolean fullscreen)
+{
+       const gchar *key = NULL;
+
+       if (window_type == MODEST_TYPE_MAIN_WINDOW)
+               key = (fullscreen) ? 
+                       MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR_FULLSCREEN :
+                       MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR;
+       else if (window_type == MODEST_TYPE_MSG_VIEW_WINDOW)
+               key = (fullscreen) ? 
+                       MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN :
+                       MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR;
+       else if (window_type ==  MODEST_TYPE_MSG_EDIT_WINDOW)
+               key = (fullscreen) ? 
+                       MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN :
+                       MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR;
+       else
+               g_return_val_if_reached (NULL);
 
+       return key;
+}
 
 void 
 modest_window_mgr_register_window (ModestWindowMgr *self, 
                                   ModestWindow *window)
 {
-       static gboolean first_time = TRUE;
        GList *win;
-       gboolean show;
        ModestWindowMgrPrivate *priv;
        gint *handler_id;
+       const gchar *key;
 
        g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
-       g_return_if_fail (MODEST_IS_WINDOW (window));
+       g_return_if_fail (GTK_IS_WINDOW (window));
 
        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");
+               /* this is for the case we want to register the window and it was already
+                * registered. We leave silently.
+                */
                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");
+                       g_warning ("%s: trying to register a second main window",
+                                  __FUNCTION__);
                        return;
                } else {
                        priv->main_window = window;
@@ -355,10 +525,28 @@ modest_window_mgr_register_window (ModestWindowMgr *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);
+               
+               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)));
+       } else if (MODEST_IS_MSG_EDIT_WINDOW(window)) {
+               const gchar *uid = modest_msg_edit_window_get_message_uid
+                       (MODEST_MSG_EDIT_WINDOW (window));
+               
+               g_debug ("registering window for %s", uid);
+
+               priv->preregistered_uids = 
+                       remove_uid (priv->preregistered_uids,
+                                   modest_msg_edit_window_get_message_uid
+                                   (MODEST_MSG_EDIT_WINDOW (window)));
        }
        
        /* Add to list. Keep a reference to the window */
@@ -384,31 +572,18 @@ modest_window_mgr_register_window (ModestWindowMgr *self,
        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);
+       /* Show/hide toolbar & fullscreen */    
+       key = get_show_toolbar_key (G_TYPE_FROM_INSTANCE (window), priv->fullscreen_mode);
+       modest_window_show_toolbar (window, modest_conf_get_bool (modest_runtime_get_conf (), key, NULL));
 }
 
-/* static void */
-/* on_window_destroy (ModestWindow *window, ModestWindowMgr *self) */
 static gboolean
 on_window_destroy (ModestWindow *window, 
                   GdkEvent *event,
                   ModestWindowMgr *self)
 {
+       gint dialog_response = GTK_RESPONSE_NONE;
+
        /* Specific stuff first */
        if (MODEST_IS_MAIN_WINDOW (window)) {
                ModestWindowMgrPrivate *priv;
@@ -417,21 +592,32 @@ on_window_destroy (ModestWindow *window,
                /* If more than one window already opened */
                if (g_list_length (priv->window_list) > 1) {
 
+                       /* Create the confirmation dialog MSG-NOT308 */
+                       dialog_response = modest_platform_run_confirmation_dialog (
+                                       GTK_WINDOW (window), _("emev_nc_close_windows"));
+
                        /* 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);
-                       }
+                       if ((dialog_response == GTK_RESPONSE_OK) 
+                                       || (dialog_response == GTK_RESPONSE_ACCEPT) 
+                                       || (dialog_response == GTK_RESPONSE_YES))
+                               {
+                                       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
+                               {
+                                       return TRUE;
+                               }
                }
        }
        else {
@@ -441,23 +627,21 @@ on_window_destroy (ModestWindow *window,
                        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))) {
+
+                               /* Raise the window if it's minimized */
+                               if (!gtk_window_has_toplevel_focus (GTK_WINDOW (window)))
+                                       gtk_window_present (GTK_WINDOW (window));
                                
                                response =
                                        modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
                                                                                 _("mcen_nc_no_email_message_modified_save_changes"));
                                /* Save to drafts */
                                if (response != GTK_RESPONSE_CANCEL)                            
-                                       modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window));
-                               
+                                       modest_ui_actions_on_save_to_drafts (NULL, 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);
        
@@ -469,20 +653,20 @@ disconnect_msg_changed (gpointer key,
                        gpointer value, 
                        gpointer user_data)
 {
-       gulong *handler_id;
-
-       handler_id = (gulong *) value;
-       g_signal_handler_disconnect (G_OBJECT (key), *handler_id);
+       guint handler_id;
+       handler_id = GPOINTER_TO_UINT(value);
+       
+       if (key && G_IS_OBJECT(key))
+               g_signal_handler_disconnect (G_OBJECT (key), handler_id);
 }
 
-
 void 
 modest_window_mgr_unregister_window (ModestWindowMgr *self, 
                                     ModestWindow *window)
 {
        GList *win;
        ModestWindowMgrPrivate *priv;
-       gint *tmp, handler_id;
+       gulong *tmp, handler_id;
 
        g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
        g_return_if_fail (MODEST_IS_WINDOW (window));
@@ -500,11 +684,27 @@ modest_window_mgr_unregister_window (ModestWindowMgr *self,
                priv->main_window = NULL;
 
                /* Disconnect all emissions of msg-changed */
-               g_hash_table_foreach (priv->viewer_handlers, 
-                                     disconnect_msg_changed, 
-                                     NULL);
-               g_hash_table_destroy (priv->viewer_handlers);
-               priv->viewer_handlers = NULL;
+               if (priv->viewer_handlers) {
+                       g_hash_table_foreach (priv->viewer_handlers, 
+                                             disconnect_msg_changed, 
+                                             NULL);
+                       g_hash_table_destroy (priv->viewer_handlers);
+                       priv->viewer_handlers = NULL;
+               }
+       }
+
+       /* Remove the viewer window handler from the hash table. The
+          HashTable could not exist if the main window was closeed
+          when there were other windows remaining */
+       if (MODEST_IS_MSG_VIEW_WINDOW (window) && priv->viewer_handlers) {
+               tmp = (gulong *) g_hash_table_lookup (priv->viewer_handlers, window);
+               /* If the viewer was created without a main window
+                  (for example when opening a message through D-Bus
+                  the viewer handlers was not registered */
+               if (tmp) {
+                       g_signal_handler_disconnect (window, *tmp);
+                       g_hash_table_remove (priv->viewer_handlers, window);
+               }
        }
 
        /* Save state */
@@ -519,25 +719,18 @@ modest_window_mgr_unregister_window (ModestWindowMgr *self,
        /* Disconnect the "delete-event" handler, we won't need it anymore */
        g_signal_handler_disconnect (window, handler_id);
 
+       /* Disconnect all the window signals */
+       modest_window_disconnect_signals (window);
+       
        /* Destroy the window */
        gtk_widget_destroy (win->data);
+       
+       /* If there are no more windows registered emit the signal */
+       if (priv->window_list == NULL)
+               g_signal_emit (self, signals[WINDOW_LIST_EMPTY_SIGNAL], 0);
+}
 
-       /* 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 ();
-       }
-}
 
 void
 modest_window_mgr_set_fullscreen_mode (ModestWindowMgr *self,
@@ -545,6 +738,7 @@ modest_window_mgr_set_fullscreen_mode (ModestWindowMgr *self,
 {
        ModestWindowMgrPrivate *priv;
        GList *win = NULL;
+       ModestConf *conf;
 
        g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
 
@@ -556,18 +750,28 @@ modest_window_mgr_set_fullscreen_mode (ModestWindowMgr *self,
 
        priv->fullscreen_mode = on;
 
+       conf = modest_runtime_get_conf ();
+
        /* Update windows */
        win = priv->window_list;
        while (win) {
-               if (on) {
+               gboolean show;
+               const gchar *key = NULL;
+
+               /* Getting this from gconf everytime is not that
+                  expensive, we'll do it just a few times */
+               key = get_show_toolbar_key (G_TYPE_FROM_INSTANCE (win->data), on);
+               show = modest_conf_get_bool (conf, key, NULL);
+
+               /* Set fullscreen/unfullscreen */
+               if (on)
                        gtk_window_fullscreen (GTK_WINDOW (win->data));
-                       modest_window_show_toolbar (MODEST_WINDOW (win->data), 
-                                                   priv->show_toolbars_fullscreen);
-               } else {
+               else
                        gtk_window_unfullscreen (GTK_WINDOW (win->data));
-                       modest_window_show_toolbar (MODEST_WINDOW (win->data), 
-                                                   priv->show_toolbars);
-               }
+
+               /* Show/Hide toolbar */
+               modest_window_show_toolbar (MODEST_WINDOW (win->data), show);
+
                win = g_list_next (win);
        }
 }
@@ -586,30 +790,27 @@ modest_window_mgr_get_fullscreen_mode (ModestWindowMgr *self)
 
 void 
 modest_window_mgr_show_toolbars (ModestWindowMgr *self,
+                                GType window_type,
                                 gboolean show_toolbars,
                                 gboolean fullscreen)
 {
        ModestWindowMgrPrivate *priv;
+       ModestConf *conf;
+       const gchar *key = NULL;
 
        g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
 
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       conf = modest_runtime_get_conf ();
 
-       /* 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;
-       }
+       /* If nothing changes then return */
+       key = get_show_toolbar_key (window_type, fullscreen);
+       conf = modest_runtime_get_conf ();
+       if (modest_conf_get_bool (conf, key, NULL) == show_toolbars)
+               return;
+
+       /* Save in conf */
+       modest_conf_set_bool (conf, key, show_toolbars, NULL);
 
        /* Apply now if the view mode is the right one */
        if ((fullscreen && priv->fullscreen_mode) ||
@@ -618,25 +819,106 @@ modest_window_mgr_show_toolbars (ModestWindowMgr *self,
                GList *win = priv->window_list;
 
                while (win) {
-                       modest_window_show_toolbar (MODEST_WINDOW (win->data),
-                                                   show_toolbars);
+                       if (G_TYPE_FROM_INSTANCE (win->data) == window_type)
+                               modest_window_show_toolbar (MODEST_WINDOW (win->data),
+                                                           show_toolbars);
                        win = g_list_next (win);
                }
        }
 }
 
 ModestWindow*  
-modest_window_mgr_get_main_window (ModestWindowMgr *self)
+modest_window_mgr_get_main_window (ModestWindowMgr *self, gboolean create)
 {
        ModestWindowMgrPrivate *priv;
+       
+       g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
+       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       
+       /* create the main window, if it hasn't been created yet */
+       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);
+       }
+       
+       return priv->main_window;
+}
 
+
+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);
+
+       return priv->main_window != NULL;
+}
+
+
+GtkWindow *
+modest_window_mgr_get_modal (ModestWindowMgr *self)
+{
+       ModestWindowMgrPrivate *priv;
+       
        g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
+       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+       return g_queue_peek_head (priv->modal_windows);
+}
+
+
+void
+modest_window_mgr_set_modal (ModestWindowMgr *self, 
+                            GtkWindow *window)
+{
+       GtkWindow *old_modal;
+       ModestWindowMgrPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
+       g_return_if_fail (GTK_IS_WINDOW (window));
 
        priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       g_mutex_lock (priv->queue_lock);
+       old_modal = g_queue_peek_head (priv->modal_windows);
+       g_mutex_unlock (priv->queue_lock);
 
-       return priv->main_window;
+       if (!old_modal) {       
+               gtk_window_set_modal (window, TRUE);
+       } else {
+               /* un-modalize the old one; the one on top should be the
+                * modal one */
+               gtk_window_set_transient_for (window, GTK_WINDOW(old_modal));   
+               gtk_window_set_modal (window, TRUE);
+       }
+
+       /* this will be the new modal window */
+       g_mutex_lock (priv->queue_lock);
+       g_queue_push_head (priv->modal_windows, window);
+       g_mutex_unlock (priv->queue_lock);
+
+       if (GTK_IS_DIALOG (window))
+               /* Note that response is not always enough because it
+                  could be captured and removed easily by dialogs but
+                  works for most of situations */
+               priv->modal_handler_uids = 
+                       modest_signal_mgr_connect (priv->modal_handler_uids, 
+                                                  G_OBJECT (window), 
+                                                  "response",
+                                                  G_CALLBACK (on_modal_dialog_close), 
+                                                  self);
+       else
+               priv->modal_handler_uids = 
+                       modest_signal_mgr_connect (priv->modal_handler_uids, 
+                                                  G_OBJECT (window), 
+                                                  "delete-event",
+                                                  G_CALLBACK (on_modal_window_close), 
+                                                  self);
 }
 
+
 static void
 on_nonhibernating_window_hide(GtkWidget *widget, gpointer user_data)
 {
@@ -665,7 +947,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));
@@ -679,7 +962,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);
        
@@ -691,7 +975,8 @@ 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)
 {
        g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
        
@@ -710,3 +995,92 @@ void modest_window_mgr_save_state_for_all_windows (ModestWindowMgr *self)
                win = g_list_next (win);
        }
 }
+
+static gboolean
+idle_top_modal (gpointer data)
+{
+       ModestWindowMgr *self = MODEST_WINDOW_MGR (data);
+       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+       GtkWindow *topmost;
+
+       /* Get the top modal */
+       g_mutex_lock (priv->queue_lock);
+       topmost = (GtkWindow *) g_queue_peek_head (priv->modal_windows);
+       g_mutex_unlock (priv->queue_lock);
+
+       /* Show it */
+       if (topmost)
+               gtk_window_present (topmost);
+
+       return FALSE;
+}
+
+static void
+remove_modal_from_queue (GtkWidget *widget,
+                        ModestWindowMgr *self)
+{
+       ModestWindowMgrPrivate *priv;
+       GList *item = NULL;
+
+       priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
+
+       /* Remove from queue. We don't use remove, because we want to
+          exit if the widget does not belong to the queue */
+       g_mutex_lock (priv->queue_lock);
+       item = g_queue_find (priv->modal_windows, widget);
+       if (!item) {
+               g_warning ("Trying to remove a modal window that is not registered");
+               g_mutex_unlock (priv->queue_lock);
+               return;
+       }
+       g_queue_unlink (priv->modal_windows, item);
+       g_mutex_unlock (priv->queue_lock);
+
+       /* Disconnect handler */
+       priv->modal_handler_uids = 
+               modest_signal_mgr_disconnect (priv->modal_handler_uids, 
+                                             G_OBJECT (widget),
+                                             GTK_IS_DIALOG (widget) ? 
+                                             "response" : 
+                                             "destroy-event");
+
+       /* Schedule the next one for being shown */
+       g_idle_add (idle_top_modal, self);
+}
+
+static gboolean
+on_modal_window_close (GtkWidget *widget,
+                      GdkEvent *event,
+                      gpointer user_data)
+{
+       ModestWindowMgr *self = MODEST_WINDOW_MGR (user_data);
+
+       /* Remove modal window from queue */
+       remove_modal_from_queue (widget, self);
+
+       /* Continue */
+       return FALSE;
+}
+
+static void
+on_modal_dialog_close (GtkDialog *dialog,
+                      gint arg1,
+                      gpointer user_data)
+{
+       ModestWindowMgr *self = MODEST_WINDOW_MGR (user_data);
+
+       /* Remove modal window from queue */
+       remove_modal_from_queue (GTK_WIDGET (dialog), self);
+}
+
+gint 
+modest_window_mgr_num_windows (ModestWindowMgr *self)
+{
+       ModestWindowMgrPrivate *priv = MODEST_WINDOW_MGR_GET_PRIVATE(self);
+       gint num_windows = 0;
+
+       if (priv->window_list)
+               num_windows = g_list_length (priv->window_list);
+
+       return num_windows;
+}