#include "modest-window-mgr.h"
#include "modest-runtime.h"
#include "modest-tny-folder.h"
+#include "modest-ui-actions.h"
+#include "modest-platform.h"
#include "widgets/modest-main-window.h"
#include "widgets/modest-msg-edit-window.h"
#include "widgets/modest-msg-view-window.h"
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 void on_window_destroy (ModestWindow *window, */
+/* ModestWindowMgr *self); */
+static gboolean on_window_destroy (ModestWindow *window,
+ GdkEvent *event,
+ ModestWindowMgr *self);
/* list my signals */
enum {
typedef struct _ModestWindowMgrPrivate ModestWindowMgrPrivate;
struct _ModestWindowMgrPrivate {
- GList *window_list;
+ GList *window_list;
ModestWindow *main_window;
- gboolean fullscreen_mode;
- gboolean show_toolbars;
- gboolean show_toolbars_fullscreen;
+ gboolean fullscreen_mode;
+ gboolean show_toolbars;
+ gboolean show_toolbars_fullscreen;
- GSList* windows_that_prevent_hibernation;
+ GSList *windows_that_prevent_hibernation;
+ GHashTable *destroy_handlers;
};
#define MODEST_WINDOW_MGR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_WINDOW_MGR, \
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);
}
static void
priv->window_list = NULL;
}
+ /* Free the hash table with the handlers */
+ if (priv->destroy_handlers) {
+ g_hash_table_destroy (priv->destroy_handlers);
+ priv->destroy_handlers = NULL;
+ }
+
/* Do not unref priv->main_window because it does not hold a
new reference */
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));
priv->window_list = g_list_prepend (priv->window_list, window);
/* Listen to object destruction */
- g_signal_connect (window, "destroy", G_CALLBACK (on_window_destroy), self);
+ 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)
modest_window_show_toolbar (window, show);
}
-static void
-on_window_destroy (ModestWindow *window, ModestWindowMgr *self)
+/* 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)) {
if (iter->data != window) {
GList *tmp = iter->next;
on_window_destroy (MODEST_WINDOW (iter->data),
+ event,
self);
iter = tmp;
} else {
} while (iter);
}
}
- } else {
+ }
+ else {
if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
- /* TODO: Save currently edited message to Drafts
- folder */
+ 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_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));
+
+ }
}
}
/* Unregister window */
modest_window_mgr_unregister_window (self, window);
+
+ return FALSE;
}
void
{
GList *win;
ModestWindowMgrPrivate *priv;
+ gint *tmp, handler_id;
g_return_if_fail (MODEST_IS_WINDOW_MGR (self));
g_return_if_fail (MODEST_IS_WINDOW (window));
if (priv->main_window == window)
priv->main_window = NULL;
- /* Remove from list. Remove the reference to the window */
- g_object_unref (win->data);
+ /* 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) {