X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=f43ffbf6588b83b5037a5cecc21382d1dbb3ee27;hp=c69a15ebbbb1903affe6724751b968b1b521b022;hb=271699adf62b6841495684d3f106108318211b62;hpb=ae06a114724e713c7cc743f8ea792ca91f65c4d4 diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index c69a15e..f43ffbf 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -700,12 +700,8 @@ modest_ui_actions_on_add_to_contacts (GtkAction *action, ModestWindow *win) clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); selection = gtk_clipboard_wait_for_text (clipboard); - /* Question: why is the clipboard being used here? - * It doesn't really make a lot of sense. */ - - if (selection) - { - modest_address_book_add_address (selection); + if (selection) { + modest_address_book_add_address (selection, (GtkWindow *) win); g_free (selection); } } @@ -994,19 +990,27 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op, error->code == TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE)) { gchar *subject, *msg, *format = NULL; TnyAccount *account; - - subject = header?tny_header_dup_subject (header):NULL; + + subject = (header) ? tny_header_dup_subject (header) : NULL; if (!subject) subject = g_strdup (_("mail_va_no_subject")); account = modest_mail_operation_get_account (mail_op); if (account) { - ModestProtocol *protocol; - ModestProtocolType proto; - proto = modest_tny_account_get_protocol_type (account); - protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), proto); - if (protocol) - format = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, subject); + ModestProtocolType proto = modest_tny_account_get_protocol_type (account); + ModestProtocol *protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), proto); + + if (protocol) { + if (tny_account_get_connection_status (account) == + TNY_CONNECTION_STATUS_CONNECTED) { + format = modest_protocol_get_translation (protocol, + MODEST_PROTOCOL_TRANSLATION_MSG_NOT_AVAILABLE, + subject); + } else { + format = g_strdup_printf (_("mail_ib_backend_server_invalid"), + tny_account_get_hostname (account)); + } + } g_object_unref (account); } @@ -1924,7 +1928,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) ReplyForwardHelper *rf_helper = NULL; guint reply_forward_type; - g_return_if_fail (MODEST_IS_WINDOW(win)); + g_return_if_fail (win && MODEST_IS_WINDOW(win)); /* we check for low-mem; in that case, show a warning, and don't allow * reply/forward (because it could potentially require a lot of memory */ @@ -2044,7 +2048,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) if (folder) g_object_unref (folder); } else { - reply_forward_cb (NULL, header, FALSE, NULL, NULL, rf_helper); + reply_forward_cb (NULL, header, FALSE, NULL, NULL, NULL); } /* Frees */ g_object_unref (header_list); @@ -2179,7 +2183,12 @@ new_messages_arrived (ModestMailOperation *self, flags = tny_header_get_flags (header); if (!(flags & TNY_HEADER_FLAG_SEEN)) { - tny_list_append (actually_new_list, G_OBJECT (header)); + /* Messages are ordered from most + recent to oldest. But we want to + show notifications starting from + the oldest message. That's why we + reverse the list */ + tny_list_prepend (actually_new_list, G_OBJECT (header)); } g_object_unref (header); } @@ -2203,29 +2212,6 @@ new_messages_arrived (ModestMailOperation *self, } -gboolean -retrieve_all_messages_cb (GObject *source, - guint num_msgs, - guint retrieve_limit) -{ - GtkWindow *window; - gchar *msg; - gint response; - - window = GTK_WINDOW (source); - msg = g_strdup_printf (_("mail_nc_msg_count_limit_exceeded"), - num_msgs, retrieve_limit); - - /* Ask the user if they want to retrieve all the messages */ - response = - modest_platform_run_confirmation_dialog_with_buttons (window, msg, - _("mcen_bd_get_all"), - _("mcen_bd_newest_only")); - /* Free and return */ - g_free (msg); - return (response == GTK_RESPONSE_ACCEPT) ? TRUE : FALSE; -} - typedef struct { TnyAccount *account; ModestWindow *win; @@ -2271,7 +2257,6 @@ do_send_receive_performer (gboolean canceled, /* Send & receive. */ modest_mail_operation_update_account (info->mail_op, info->account_name, info->poke_status, info->interactive, - (info->win) ? retrieve_all_messages_cb : NULL, new_messages_arrived, info->win); clean: @@ -4816,6 +4801,16 @@ modest_ui_actions_on_details (GtkAction *action, } void +modest_ui_actions_on_limit_error (GtkAction *action, + ModestWindow *win) +{ + g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win)); + + modest_platform_information_banner ((GtkWidget *) win, NULL, _CS("ckdg_ib_maximum_characters_reached")); + +} + +void modest_ui_actions_on_toggle_show_cc (GtkToggleAction *toggle, ModestMsgEditWindow *window) { @@ -5664,20 +5659,20 @@ xfer_messages_error_handler (ModestMailOperation *mail_op, win = modest_mail_operation_get_source (mail_op); error = modest_mail_operation_get_error (mail_op); - account = modest_mail_operation_get_account (mail_op); - if (error && modest_tny_account_store_is_disk_full_error (modest_runtime_get_account_store(), - (GError *) error, account)) { - gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), ""); - modest_platform_information_banner ((GtkWidget *) win, NULL, msg); - g_free (msg); - } else { + /* We cannot get the account from the mail op as that is the + source account and for checking memory full conditions we + need the destination one */ + account = TNY_ACCOUNT (user_data); + + if (error && + !modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(), + (GtkWidget *) win, (GError*) error, + account, _KR("cerm_memory_card_full"))) { modest_platform_run_information_dialog ((GtkWindow *) win, _("mail_in_ui_folder_move_target_error"), FALSE); } - if (account) - g_object_unref (account); if (win) g_object_unref (win); } @@ -5722,8 +5717,7 @@ xfer_messages_performer (gboolean canceled, /* tinymail will return NULL for local folders it seems */ dst_forbids_message_add = modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (), modest_tny_account_get_protocol_type (dst_account), - MODEST_PROTOCOL_REGISTRY_STORE_FORBID_MESSAGE_ADD); - g_object_unref (dst_account); + MODEST_PROTOCOL_REGISTRY_STORE_FORBID_INCOMING_XFERS); if (dst_forbids_message_add) { modest_platform_information_banner (GTK_WIDGET (win), @@ -5755,7 +5749,8 @@ xfer_messages_performer (gboolean canceled, /* Perform the mail operation */ mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(win), xfer_messages_error_handler, - movehelper, NULL); + g_object_ref (dst_account), + g_object_unref); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); @@ -5768,6 +5763,8 @@ xfer_messages_performer (gboolean canceled, g_object_unref (G_OBJECT (mail_op)); end: + if (dst_account) + g_object_unref (dst_account); g_object_unref (helper->dst_folder); g_object_unref (helper->headers); g_slice_free (XferMsgsHelper, helper); @@ -6864,8 +6861,15 @@ modest_ui_actions_on_delete_account (GtkWindow *parent_window, g_free (default_account_name); removed = modest_account_mgr_remove_account (account_mgr, account_name); - if (!removed) + if (removed) { + /* Close all email notifications, we cannot + distinguish if the notification belongs to + this account or not, so for safety reasons + we remove them all */ + modest_platform_remove_new_mail_notifications (FALSE); + } else { g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__); + } } return removed; }