X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=074f8662a1aec3cfece3114b28f1459484bcab05;hp=77121731568205d76e7ce3fbafacee36dda057f3;hb=a9407524d291e7cf2bd6e489bf17704a78303e80;hpb=d35c9918f4df9384dee13049f7d3344a47227f22 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 7712173..074f866 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -82,6 +82,8 @@ #include +#define MIN_FREE_SPACE 5 * 1024 * 1024 + typedef struct _GetMsgAsyncHelper { ModestWindow *window; ModestMailOperation *mail_op; @@ -215,10 +217,17 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win) win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), TRUE); /* create if not existent */ - /* make sure the mainwindow is visible */ gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win)); - gtk_widget_show_all (GTK_WIDGET(win)); - gtk_window_present (GTK_WINDOW(win)); + + /* make sure the mainwindow is visible. We need to present the + wizard again to give it the focus back. show_all are needed + in order to get the widgets properly drawn (MainWindow main + paned won't be in its right position and the dialog will be + missplaced */ + gtk_widget_show_all (GTK_WIDGET (win)); + gtk_widget_show_all (GTK_WIDGET (wizard)); + gtk_window_present (GTK_WINDOW (win)); + gtk_window_present (GTK_WINDOW (wizard)); dialog_response = gtk_dialog_run (GTK_DIALOG (wizard)); gtk_widget_destroy (GTK_WIDGET (wizard)); @@ -512,7 +521,6 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) /* Select next or previous row */ if (gtk_tree_row_reference_valid (next_row_reference)) { -/* next_path = gtk_tree_row_reference_get_path (row_reference); */ gtk_tree_selection_select_path (sel, next_path); } else if (gtk_tree_row_reference_valid (prev_row_reference)) { @@ -531,8 +539,10 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) } /* Update toolbar dimming state */ - if (main_window) + if (main_window) { + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window)); modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); + } /* Free */ g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL); @@ -773,8 +783,6 @@ cleanup: g_object_unref (G_OBJECT(account)); if (folder) g_object_unref (G_OBJECT(folder)); - if (msg_win) - g_object_unref (G_OBJECT(msg_win)); if (msg) g_object_unref (G_OBJECT(msg)); } @@ -986,7 +994,6 @@ open_msg_cb (ModestMailOperation *mail_op, if (win != NULL) { mgr = modest_runtime_get_window_mgr (); modest_window_mgr_register_window (mgr, win); - g_object_unref (win); gtk_widget_show_all (GTK_WIDGET(win)); } @@ -1005,15 +1012,51 @@ cleanup: static gboolean is_memory_full_error (GError *error) { - if (error->code == TNY_SYSTEM_ERROR_MEMORY || - error->code == TNY_IO_ERROR_WRITE || - error->code == TNY_IO_ERROR_READ) { + gboolean enough_free_space = TRUE; + GnomeVFSURI *cache_dir_uri; + const gchar *cache_dir; + GnomeVFSFileSize free_space; + + cache_dir = tny_account_store_get_cache_dir (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); + cache_dir_uri = gnome_vfs_uri_new (cache_dir); + if (gnome_vfs_get_volume_free_space (cache_dir_uri, &free_space) == GNOME_VFS_OK) { + if (free_space < MIN_FREE_SPACE) + enough_free_space = FALSE; + } + gnome_vfs_uri_unref (cache_dir_uri); + + if ((error->code == TNY_SYSTEM_ERROR_MEMORY || + error->code == TNY_IO_ERROR_WRITE || + error->code == TNY_IO_ERROR_READ) && + !enough_free_space) { return TRUE; } else { return FALSE; } } +static gboolean +check_memory_full_error (GtkWidget *parent_window, GError *err) +{ + if (err == NULL) + return FALSE; + + if (is_memory_full_error (err)) + modest_platform_information_banner (parent_window, + NULL, dgettext("ke-recv", + "cerm_device_memory_full")); + else if (err->code == TNY_SYSTEM_ERROR_MEMORY) + /* If the account was created in memory full + conditions then tinymail won't be able to + connect so it'll return this error code */ + modest_platform_information_banner (parent_window, + NULL, _("emev_ui_imap_inbox_select_error")); + else + return FALSE; + + return TRUE; +} + void modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op, gpointer user_data) @@ -1033,7 +1076,11 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op, modest_platform_information_banner ((GtkWidget *) win, NULL, dgettext("ke-recv", "cerm_device_memory_full")); - } else if (error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) { + } else if (error->code == TNY_SYSTEM_ERROR_MEMORY) { + modest_platform_information_banner ((GtkWidget *) win, + NULL, _("emev_ui_imap_inbox_select_error")); + } else if (error->domain == MODEST_MAIL_OPERATION_ERROR && + error->code == MODEST_MAIL_OPERATION_ERROR_FILE_IO) { modest_platform_information_banner ((GtkWidget *) win, NULL, dgettext ("hildon-common-strings", "sfil_ni_unable_to_open_file_not_found")); } else if (user_data) { @@ -1150,11 +1197,8 @@ open_msgs_performer(gboolean canceled, open_msgs_helper_destroyer (helper); /* In memory full conditions we could get this error here */ - if (err && is_memory_full_error (err)) { - modest_platform_information_banner ((GtkWidget *) parent_window, - NULL, dgettext("ke-recv", - "cerm_device_memory_full")); - } + check_memory_full_error ((GtkWidget *) parent_window, err); + goto clean; } @@ -1545,8 +1589,6 @@ reply_forward_cb (ModestMailOperation *mail_op, gtk_widget_show_all (GTK_WIDGET (msg_win)); cleanup: - if (msg_win) - g_object_unref (msg_win); if (new_msg) g_object_unref (G_OBJECT (new_msg)); if (account) @@ -1854,7 +1896,7 @@ modest_ui_actions_on_sort (GtkAction *action, } /* Show sorting dialog */ - modest_platform_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS); + modest_utils_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS); } } @@ -1926,11 +1968,8 @@ do_send_receive_performer (gboolean canceled, if (err || canceled) { /* In memory full conditions we could get this error here */ - if (err && is_memory_full_error (err)) { - modest_platform_information_banner ((GtkWidget *) parent_window, - NULL, dgettext("ke-recv", - "cerm_device_memory_full")); - } + check_memory_full_error ((GtkWidget *) parent_window, err); + if (info->mail_op) { modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), info->mail_op); @@ -2210,8 +2249,10 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view, GtkWidget *folder_view = modest_main_window_get_child_widget (main_window, MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - if (folder != NULL) + if (folder != NULL) { modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), folder, FALSE); + g_object_unref (folder); + } gtk_widget_grab_focus (GTK_WIDGET (folder_view)); return; } @@ -2367,11 +2408,16 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, } } else { if (TNY_IS_FOLDER (folder_store) && selected) { - + TnyAccount *account; + const gchar *account_name = NULL; + gboolean refresh; + /* Update the active account */ - TnyAccount *account = modest_tny_folder_get_account (TNY_FOLDER (folder_store)); + account = modest_tny_folder_get_account (TNY_FOLDER (folder_store)); if (account) { set_active_account_from_tny_account (account, MODEST_WINDOW (main_window)); + account_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (account); g_object_unref (account); account = NULL; } @@ -2382,6 +2428,8 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS); + refresh = !modest_account_mgr_account_is_busy (modest_runtime_get_account_mgr (), account_name); + /* Set folder on header view. This function will call tny_folder_refresh_async so we pass a callback that will be called when @@ -2389,6 +2437,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, empty view if there are no messages */ modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view), TNY_FOLDER (folder_store), + refresh, folder_refreshed_cb, main_window); @@ -2828,7 +2877,8 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) if (modest_mail_operation_get_error (mail_operation) != NULL) { const GError *error = modest_mail_operation_get_error (mail_operation); - if (error->code == MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED) { + if (error->domain == MODEST_MAIL_OPERATION_ERROR && + error->code == MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED) { g_warning ("%s failed: %s\n", __FUNCTION__, (modest_mail_operation_get_error (mail_operation))->message); modest_platform_information_banner (NULL, NULL, _CS("sfil_ni_not_enough_memory")); had_error = TRUE; @@ -3005,6 +3055,38 @@ modest_ui_actions_on_remove_attachments (GtkAction *action, modest_msg_edit_window_remove_attachments (window, NULL); } + +#ifdef MODEST_PLATFORM_MAEMO +typedef struct { + guint handler; + gchar *name; + GtkWindow *win; + TnyFolderStore *folder; +} CreateFolderHelper; + +static gboolean +show_create_folder_in_timeout (gpointer data) +{ + CreateFolderHelper *helper = (CreateFolderHelper *) data; + + /* Remove the timeout ASAP, we can not wait until the dialog + is shown because it could take a lot of time and so the + timeout could be called twice or more times */ + g_source_remove (helper->handler); + + gdk_threads_enter (); + do_create_folder (helper->win, helper->folder, helper->name); + gdk_threads_leave (); + + g_object_unref (helper->win); + g_object_unref (helper->folder); + g_free (helper->name); + g_slice_free (CreateFolderHelper, helper); + + return FALSE; +} +#endif + static void do_create_folder_cb (ModestMailOperation *mail_op, TnyFolderStore *parent_folder, @@ -3029,7 +3111,21 @@ do_create_folder_cb (ModestMailOperation *mail_op, /* Try again. Do *NOT* show any error because the mail operations system will do it for us because we created the mail_op with new_with_error_handler */ +#ifdef MODEST_PLATFORM_MAEMO + CreateFolderHelper *helper; + helper = g_slice_new0 (CreateFolderHelper); + helper->name = g_strdup (suggested_name); + helper->folder = g_object_ref (parent_folder); + helper->win = g_object_ref (source_win); + + /* Ugly but neccesary stuff. The problem is that the + dialog when is shown calls a function that destroys + all the temporary windows, so the banner is + destroyed */ + helper->handler = g_timeout_add (2000, show_create_folder_in_timeout, helper); +#else do_create_folder (source_win, parent_folder, (const gchar *) suggested_name); +#endif } else { /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog * FIXME: any other? */ @@ -3095,11 +3191,7 @@ create_folder_performer (gboolean canceled, if (canceled || err) { /* In memory full conditions we could get this error here */ - if (err && is_memory_full_error (err)) { - modest_platform_information_banner ((GtkWidget *) parent_window, - NULL, dgettext("ke-recv", - "cerm_device_memory_full")); - } + check_memory_full_error ((GtkWidget *) parent_window, err); goto frees; } @@ -3155,16 +3247,15 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op, if (!error) g_return_if_reached (); - switch (error->code) { - case MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS: + if (error->domain == MODEST_MAIL_OPERATION_ERROR && + error->code == MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS) { message = _CS("ckdg_ib_folder_already_exists"); - break; - case TNY_SERVICE_ERROR_STATE: + } else if (error->domain == TNY_ERROR_DOMAIN && + error->code == TNY_SERVICE_ERROR_STATE) { /* This means that the folder is already in use (a message is opened for example */ message = _("emev_ni_internal_error"); - break; - default: + } else { message = _("emev_ib_ui_imap_unable_to_rename"); } @@ -3214,11 +3305,7 @@ on_rename_folder_performer (gboolean canceled, if (canceled || err) { /* In memory full conditions we could get this error here */ - if (err && is_memory_full_error (err)) { - modest_platform_information_banner ((GtkWidget *) parent_window, - NULL, dgettext("ke-recv", - "cerm_device_memory_full")); - } + check_memory_full_error ((GtkWidget *) parent_window, err); } else if (MODEST_IS_MAIN_WINDOW(parent_window)) { folder_view = modest_main_window_get_child_widget ( @@ -4030,9 +4117,9 @@ modest_ui_actions_on_select_all (GtkAction *action, /* Set focuse on header view */ gtk_widget_grab_focus (header_view); - /* Enable window dimming management */ modest_window_enable_dimming (MODEST_WINDOW(window)); + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window)); modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); } @@ -4393,8 +4480,13 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self, return; children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area)); +#ifdef MODEST_PLATFORM_MAEMO ok_button = GTK_WIDGET (children->next->next->data); new_button = GTK_WIDGET (children->next->data); +#else + ok_button = GTK_WIDGET (children->data); + new_button = GTK_WIDGET (children->next->next->data); +#endif g_list_free (children); /* check if folder_store is an remote account */ @@ -4531,12 +4623,24 @@ create_move_to_dialog (GtkWindow *win, GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, NULL); +#ifdef MODEST_PLATFORM_MAEMO gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT); /* We do this manually so GTK+ does not associate a response ID for * the button. */ new_button = gtk_button_new_from_stock (_("mcen_bd_new")); gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0); gtk_dialog_add_button (GTK_DIALOG (dialog), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT); +#else + /* We do this manually so GTK+ does not associate a response ID for + * the button. */ + new_button = gtk_button_new_with_label (_("mcen_ti_new_folder")); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), new_button, FALSE, FALSE, 0); + gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (GTK_DIALOG (dialog)->action_area), new_button, TRUE); + gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT); + gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 12); + gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 24); +#endif /* Create scrolled window */ scroll = gtk_scrolled_window_new (NULL, NULL); @@ -4544,6 +4648,10 @@ create_move_to_dialog (GtkWindow *win, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +#ifndef MODEST_PLATFORM_MAEMO + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN); +#endif + /* Create folder view */ *tree_view = modest_platform_create_folder_view (NULL); @@ -4623,7 +4731,11 @@ create_move_to_dialog (GtkWindow *win, scroll, TRUE, TRUE, 0); gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); +#ifdef MODEST_PLATFORM_MAEMO gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 300); +#else + gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400); +#endif return dialog; } @@ -4856,7 +4968,9 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),_("mcen_nc_purge_file_text_inbox")); if (response == GTK_RESPONSE_OK) { - modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment")); + GtkWidget *info; + info = + modest_platform_animation_banner (GTK_WIDGET (win), NULL, _("mcen_ib_removing_attachment")); iter = tny_list_create_iterator (parts); while (!tny_iterator_is_done (iter)) { TnyMimePart *part; @@ -4873,10 +4987,9 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, g_object_unref (iter); tny_msg_rewrite_cache (msg); + + gtk_widget_destroy (info); } - /* } else { */ - /* This string no longer exists, refer to NB#75415 for more info */ - /* modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged")); */ } modest_window_mgr_unregister_header (mgr, header); @@ -5073,15 +5186,8 @@ xfer_messages_performer (gboolean canceled, helper = (XferMsgsHelper *) user_data; - if (canceled) - goto end; - - if (err) { - if (is_memory_full_error (err)) { - modest_platform_information_banner ((GtkWidget *) parent_window, - NULL, dgettext("ke-recv", - "cerm_device_memory_full")); - } else { + if (canceled || err) { + if (!check_memory_full_error ((GtkWidget *) parent_window, err)) { /* Show the proper error message */ modest_ui_actions_on_account_connection_error (parent_window, account); } @@ -5589,11 +5695,7 @@ retrieve_msg_contents_performer (gboolean canceled, TnyList *headers = TNY_LIST (user_data); if (err || canceled) { - if (err && is_memory_full_error (err)) { - modest_platform_information_banner ((GtkWidget *) parent_window, - NULL, dgettext("ke-recv", - "cerm_device_memory_full")); - } + check_memory_full_error ((GtkWidget *) parent_window, err); goto out; } @@ -5859,9 +5961,12 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, TnyTransportAccount *server_account; gchar *message = NULL; - /* Don't show anything if the user cancelled something or the send receive request is not - * interactive */ + /* Don't show anything if the user cancelled something or the + * send receive request is not interactive. Authentication + * errors are managed by the account store so no need to show + * a dialog here again */ if (err->code == TNY_SYSTEM_ERROR_CANCEL || + err->code == TNY_SERVICE_ERROR_AUTHENTICATE || !modest_tny_send_queue_get_requested_send_receive (MODEST_TNY_SEND_QUEUE (self))) return; @@ -5879,9 +5984,6 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, case TNY_SERVICE_ERROR_CONNECT: message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); break; - case TNY_SERVICE_ERROR_AUTHENTICATE: - message = g_strdup_printf (_("emev_ni_ui_smtp_authentication_fail_error"), server_name); - break; case TNY_SERVICE_ERROR_SEND: message = g_strdup (dgettext("hildon-common-strings", "sfil_ib_unable_to_send")); break; @@ -5894,10 +5996,6 @@ modest_ui_actions_on_send_queue_error_happened (TnySendQueue *self, message = g_strdup (dgettext("hildon-common-strings", "sfil_ib_unable_to_send")); break; } - - /* TODO if the username or the password where not defined we - should show the Accounts Settings dialog or the Connection - specific SMTP server window */ modest_platform_run_information_dialog (NULL, message, FALSE); g_free (message);