#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 */
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;
GList *window_list;
ModestWindow *main_window;
- GtkDialog *easysetup_dialog;
+
+ GMutex *queue_lock;
+ GQueue *modal_windows;
gboolean fullscreen_mode;
GHashTable *viewer_handlers;
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, \
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)
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 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
priv->window_list = NULL;
priv->main_window = NULL;
priv->fullscreen_mode = FALSE;
- priv->easysetup_dialog = NULL;
+
+ priv->modal_windows = g_queue_new ();
+ priv->queue_lock = g_mutex_new ();
priv->preregistered_uids = NULL;
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;
+ priv->cached_view = NULL;
+ priv->cached_editor = NULL;
}
static void
{
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 */
priv->viewer_handlers = NULL;
}
- if (priv->easysetup_dialog) {
- g_warning ("%s: forgot to destroy an easysetup dialog somewhere",
- __FUNCTION__);
- gtk_widget_destroy (GTK_WIDGET(priv->easysetup_dialog));
- priv->easysetup_dialog = 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 */
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;
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)) {
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);
}
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)) {
priv->preregistered_uids = remove_uid (priv->preregistered_uids, uid);
if (has_uid (priv->preregistered_uids, 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)
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);
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;
}
}
}
-
g_free (uid);
+
return has_header || has_window;
}
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;
}
return;
} else {
priv->main_window = window;
+ load_new_view (self);
+ load_new_editor (self);
}
}
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));
GdkEvent *event,
ModestWindowMgr *self)
{
+ gint dialog_response = GTK_RESPONSE_NONE;
+
/* Specific stuff first */
if (MODEST_IS_MAIN_WINDOW (window)) {
ModestWindowMgrPrivate *priv;
/* 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"));
+
/* 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 {
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);
gpointer value,
gpointer user_data)
{
- gulong *handler_id;
-
- handler_id = (gulong *) value;
- g_signal_handler_disconnect (G_OBJECT (key), *handler_id);
-}
-
-
-
-/* interval before retrying to close the application */
-#define CLOSING_RETRY_INTERVAL 3000
-/* interval before cancel whatever is left in the queue, and closing anyway */
-#define MAX_WAIT_FOR_CLOSING 30 * 1000
-
-static gboolean
-on_quit_maybe (ModestWindowMgr *self)
-{
- ModestWindowMgrPrivate *priv;
- guint queue_num;
-
- priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
-
- /* it seems, in the meantime some windows were
- * created. in that case, stop 'on_quit_maybe' */
- if (priv->window_list) {
- priv->closing_time = 0;
- return FALSE;
- }
-
- if (priv->closing_time >= MAX_WAIT_FOR_CLOSING) {
- /* we waited long enough: cancel all remaining operations */
- g_debug ("%s: we waited long enough (%ds), cancelling queue and quiting",
- __FUNCTION__, priv->closing_time/1000);
- /* FIXME: below gives me a lot of:
- * GLIB CRITICAL ** default - modest_mail_operation_cancel:
- * assertion `priv->account' failed
- * which means there is no account for the given operation
- * so, we're not trying to be nice, we're just quiting.
- */
- //modest_mail_operation_queue_cancel_all
- // (modest_runtime_get_mail_operation_queue());
- } else {
-
- /* if there is anything left in our operation queue,
- * wait another round
- */
- queue_num = modest_mail_operation_queue_num_elements
- (modest_runtime_get_mail_operation_queue());
- if (queue_num > 0) {
- g_debug ("%s: waiting, there are still %d operation(s) queued",
- __FUNCTION__, queue_num);
- priv->closing_time += CLOSING_RETRY_INTERVAL;
- return TRUE;
- }
- }
+ guint handler_id;
+ handler_id = GPOINTER_TO_UINT(value);
- /* so: no windows left, nothing in the queue: quit */
- priv->closing_time = 0;
- gtk_main_quit ();
- return FALSE;
+ 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)
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);
- g_signal_handler_disconnect (window, *tmp);
- g_hash_table_remove (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 */
/* Destroy the window */
gtk_widget_destroy (win->data);
- /* If there are no more windows registered then exit program */
+ /* If there are no more windows registered emit the signal */
if (priv->window_list == NULL)
- g_timeout_add (CLOSING_RETRY_INTERVAL,
- (GSourceFunc)on_quit_maybe, self);
+ g_signal_emit (self, signals[WINDOW_LIST_EMPTY_SIGNAL], 0);
}
}
ModestWindow*
-modest_window_mgr_get_main_window (ModestWindowMgr *self)
+modest_window_mgr_get_main_window (ModestWindowMgr *self, gboolean create)
{
ModestWindowMgrPrivate *priv;
priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
/* create the main window, if it hasn't been created yet */
- if (!priv->main_window) {
+ 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;
}
-GtkDialog*
-modest_window_mgr_get_easysetup_dialog (ModestWindowMgr *self)
+gboolean
+modest_window_mgr_main_window_exists (ModestWindowMgr *self)
{
ModestWindowMgrPrivate *priv;
- g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), NULL);
+ g_return_val_if_fail (MODEST_IS_WINDOW_MGR (self), FALSE);
priv = MODEST_WINDOW_MGR_GET_PRIVATE (self);
- return priv->easysetup_dialog;
+ return priv->main_window != NULL;
}
-GtkDialog*
-modest_window_mgr_set_easysetup_dialog (ModestWindowMgr *self, GtkDialog *dialog)
+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 priv->easysetup_dialog = dialog;
+ 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);
+
+ 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);
}
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;
+}
+
+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;
+}