X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window-mgr.c;h=2cfd9c395660f6176c3f993b271f5bef0fed93b0;hb=68cd3e4130c5504c59a52f381ed10e6094da3456;hp=afd34199d1869e8381935c2265af27680eb6fa79;hpb=349e76f570b972d7a499eafba7696ddd8dacacff;p=modest diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c index afd3419..2cfd9c3 100644 --- a/src/hildon2/modest-hildon2-window-mgr.c +++ b/src/hildon2/modest-hildon2-window-mgr.c @@ -43,7 +43,10 @@ #include "modest-tny-folder.h" #include "modest-folder-window.h" #include "modest-accounts-window.h" -#include +#include "modest-maemo-utils.h" +#include "modest-utils.h" +#include "modest-tny-msg.h" +#include /* 'private'/'protected' functions */ static void modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass); @@ -83,6 +86,9 @@ static ModestWindow *modest_hildon2_window_mgr_get_current_top (ModestWindowMgr static gboolean modest_hildon2_window_mgr_screen_is_on (ModestWindowMgr *self); static void osso_display_event_cb (osso_display_state_t state, gpointer data); +static void on_account_removed (TnyAccountStore *acc_store, + TnyAccount *account, + gpointer user_data); typedef struct _ModestHildon2WindowMgrPrivate ModestHildon2WindowMgrPrivate; struct _ModestHildon2WindowMgrPrivate { @@ -207,12 +213,11 @@ modest_hildon2_window_mgr_finalize (GObject *obj) priv->window_state_uids = NULL; osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (), - NULL, - NULL); + NULL, NULL); acc_store = modest_runtime_get_account_store (); if (acc_store && g_signal_handler_is_connected (acc_store, priv->accounts_handler)) - g_signal_handler_disconnect (acc_store, priv->accounts_handler); + g_signal_handler_disconnect (acc_store, priv->accounts_handler); if (priv->window_list) { GList *iter = priv->window_list; @@ -518,9 +523,40 @@ 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))) { - - if (!modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window))) - return TRUE; + ModestMsgEditWindow *edit_window; + MsgData *data; + + edit_window = MODEST_MSG_EDIT_WINDOW (window); + data = modest_msg_edit_window_get_msg_data (edit_window); + + if (data) { + gint parts_count; + guint64 parts_size, available_size, expected_size; + + available_size = modest_utils_get_available_space (NULL); + modest_msg_edit_window_get_parts_size (edit_window, &parts_count, &parts_size); + expected_size = modest_tny_msg_estimate_size (data->plain_body, + data->html_body, + parts_count, + parts_size); + modest_msg_edit_window_free_msg_data (edit_window, data); + data = NULL; + + /* If there is not enough space + available for saving the message + then show an error and close the + window without saving */ + if (expected_size >= available_size) { + modest_platform_run_information_dialog (GTK_WINDOW (edit_window), + _("mail_in_ui_save_error"), + FALSE); + } else { + if (!modest_ui_actions_on_save_to_drafts (NULL, MODEST_MSG_EDIT_WINDOW (window))) + return TRUE; + } + } else { + g_warning ("Edit window without message data. This is probably a bug"); + } } } @@ -703,29 +739,6 @@ modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self, gtk_window_set_destroy_with_parent (window, TRUE); } -static ModestWindow * -create_folders_view (ModestWindowMgr *self) -{ - GtkWidget *folders_window; - ModestAccountMgr *mgr; - const gchar *acc_name; - - folders_window = (GtkWidget *) modest_folder_window_new (NULL); - mgr = modest_runtime_get_account_mgr (); - acc_name = modest_account_mgr_get_default_account (mgr); - if (!acc_name) - acc_name = MODEST_LOCAL_FOLDERS_ACCOUNT_NAME; - modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folders_window), - acc_name); - if (modest_window_mgr_register_window (self, MODEST_WINDOW (folders_window), NULL)) { - gtk_widget_show (folders_window); - } else { - gtk_widget_destroy (folders_window); - folders_window = NULL; - } - return MODEST_WINDOW (folders_window); -} - static void on_account_removed (TnyAccountStore *acc_store, TnyAccount *account, @@ -733,6 +746,7 @@ on_account_removed (TnyAccountStore *acc_store, { HildonWindowStack *stack; ModestWindow *current_top; + gboolean has_accounts; /* Ignore transport account removals */ if (TNY_IS_TRANSPORT_ACCOUNT (account)) @@ -740,50 +754,77 @@ on_account_removed (TnyAccountStore *acc_store, stack = hildon_window_stack_get_default (); current_top = (ModestWindow *) hildon_window_stack_peek (stack); + has_accounts = modest_account_mgr_has_accounts (modest_runtime_get_account_mgr (), TRUE); + + /* if we're showing the header view of the currently deleted + account, or the outbox and we deleted the last account, + then close the window */ + if (current_top && MODEST_IS_HEADER_WINDOW (current_top)) { + ModestHeaderView *header_view; + TnyFolder *folder; + gboolean deleted = FALSE; + + header_view = modest_header_window_get_header_view (MODEST_HEADER_WINDOW (current_top)); + folder = modest_header_view_get_folder (header_view); + if (folder) { + gboolean retval; + + /* Close if it's my account */ + if (!TNY_IS_MERGE_FOLDER (folder)) { + TnyAccount *my_account; + + my_account = tny_folder_get_account (folder); + if (my_account) { + if (my_account == account) { + g_signal_emit_by_name (G_OBJECT (current_top), + "delete-event", + NULL, &retval); + deleted = TRUE; + } + g_object_unref (my_account); + } + } + + /* Close if viewing outbox and no account left */ + if (tny_folder_get_folder_type (folder) == TNY_FOLDER_TYPE_OUTBOX) { + if (!has_accounts) { + g_signal_emit_by_name (G_OBJECT (current_top), + "delete-event", + NULL, &retval); + deleted = TRUE; + } + } + g_object_unref (folder); - if (current_top && - MODEST_IS_ACCOUNTS_WINDOW (current_top) && - !modest_account_mgr_has_accounts (modest_runtime_get_account_mgr (), TRUE)) - create_folders_view (MODEST_WINDOW_MGR (user_data)); + if (deleted) { + current_top = (ModestWindow *) hildon_window_stack_peek (stack); + } + } + } } static ModestWindow * modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self) { ModestWindow *initial_window = NULL; - ModestTnyAccountStore *acc_store; ModestHildon2WindowMgrPrivate *priv; - /* Return accounts window */ - initial_window = MODEST_WINDOW (modest_accounts_window_new ()); - modest_window_mgr_register_window (self, initial_window, NULL); + priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self); - /* Check if we have at least one remote account to create also - the folders window */ - acc_store = modest_runtime_get_account_store (); - if (modest_tny_account_store_get_num_remote_accounts (acc_store) < 1) { - ModestWindow *win; - /* Show first the accounts window to add it to the - stack. This has to be changed when the new - stackable API is available. There will be a method - to show all the windows that will only show the - last one to the user. The current code shows both - windows, one after the other */ - gtk_widget_show (GTK_WIDGET (initial_window)); - - win = create_folders_view (MODEST_WINDOW_MGR (self)); - if (win) - initial_window = win; + /* Connect to the account store "account-removed" signal". We + do this here because in the init the singletons are still + not initialized properly */ + if (!g_signal_handler_is_connected (modest_runtime_get_account_store (), + priv->accounts_handler)) { + priv->accounts_handler = g_signal_connect (modest_runtime_get_account_store (), + "account-removed", + G_CALLBACK (on_account_removed), + self); } - /* Connect to the account store "account-removed" signal". If - we're showing the accounts window and all the accounts are - deleted we need to move to folders window automatically */ - priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self); - priv->accounts_handler = g_signal_connect (acc_store, - "account-removed", - G_CALLBACK (on_account_removed), - self); + /* Return accounts window */ + initial_window = MODEST_WINDOW (modest_accounts_window_new ()); + modest_window_mgr_register_window (self, initial_window, NULL); return initial_window; }