Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bug #648468 - Disconnect service after mail fetching is done | Milan Crha | 2011-06-21 | 1 | -1/+8 |
| | |||||
* | Could not select real Junk/Trash folder | Milan Crha | 2011-06-17 | 1 | -5/+16 |
| | |||||
* | Bug #638307 - Error when sending mail after converting to maildir | Milan Crha | 2011-06-17 | 1 | -0/+76 |
| | |||||
* | Fix few memory leaks | Milan Crha | 2011-06-15 | 3 | -3/+17 |
| | |||||
* | Bug #530335 - Allow Reply to selected address only | Rathin | 2011-06-14 | 6 | -4/+90 |
| | |||||
* | Remove unused variables reported by gcc | Milan Crha | 2011-06-14 | 1 | -8/+1 |
| | |||||
* | Do not use deprecated EBook/ECal API | Milan Crha | 2011-06-14 | 2 | -86/+101 |
| | |||||
* | Fix some uninitialized variable usage. | Matthew Barnes | 2011-06-09 | 1 | -2/+2 |
| | |||||
* | Coding style and whitespace cleanups. | Matthew Barnes | 2011-06-09 | 18 | -114/+269 |
| | |||||
* | Miscellaneous mail cleanups. | Matthew Barnes | 2011-06-09 | 3 | -25/+48 |
| | |||||
* | Fixes a crash while creating VeeFolders at the root level. | Chenthill Palanisamy | 2011-06-07 | 1 | -1/+7 |
| | |||||
* | Bug #651976 - Reply/Forward setting isn't respected in message window | Milan Crha | 2011-06-06 | 1 | -1/+5 |
| | |||||
* | Bug #651316 - Crash with Outgoing mail filters | Milan Crha | 2011-06-03 | 1 | -1/+1 |
| | |||||
* | Bug #651761 - Message window doesn't mark message seen | Milan Crha | 2011-06-03 | 1 | -0/+1 |
| | |||||
* | Bug #651684 - Creates a copy of message in Outbox instead of replacing | Milan Crha | 2011-06-02 | 1 | -0/+38 |
| | |||||
* | Do not add 'Local delivery' accounts into folder tree | Milan Crha | 2011-06-02 | 2 | -1/+8 |
| | | | | | And make folder_tree_get_folder_info_cb() always finish properly, because evolution doesn't want to quit otherwise. | ||||
* | Bug #649757 - 'Local delivery' accounts stopped working | Milan Crha | 2011-06-02 | 1 | -5/+31 |
| | |||||
* | vfolder_adduri(): Take an EMailBackend instead of EMailSession. | Matthew Barnes | 2011-06-02 | 1 | -14/+17 |
| | | | | Needed for the account-mgmt branch. | ||||
* | EMVFolderRule: Track folder URIs in a GQueue instead of GList. | Matthew Barnes | 2011-06-02 | 3 | -95/+97 |
| | | | | Makes the logic a little cleaner. Do this also in mail-vfolder.c. | ||||
* | Bug #578245 - View settings for threads getting lost | Milan Crha | 2011-06-01 | 2 | -29/+26 |
| | |||||
* | e-mail-folder-utils.c cleanups. | Matthew Barnes | 2011-06-01 | 1 | -4/+0 |
| | |||||
* | Fix build breaks. | Matthew Barnes | 2011-06-01 | 2 | -28/+29 |
| | |||||
* | mail_vfolder_add_folder(): Change parameters. | Matthew Barnes | 2011-06-01 | 1 | -8/+11 |
| | | | | Take an EMailBackend instead of an EMailSession. | ||||
* | Replace deprecated g_atomic_int_exchange_and_add() | Milan Crha | 2011-06-01 | 2 | -2/+2 |
| | |||||
* | EMFilterFolderElement cleanups. | Matthew Barnes | 2011-06-01 | 1 | -128/+127 |
| | |||||
* | EMFolderSourceElement: Store UIDs instead of URIs. | Matthew Barnes | 2011-06-01 | 1 | -92/+94 |
| | | | | | For backward-compatibility we can still decode <uri> elements, but new source rules will store the account UID, which is easier to deal with. | ||||
* | EMFilterSourceElement: Add an EMailBackend constructor property. | Matthew Barnes | 2011-06-01 | 3 | -10/+106 |
| | |||||
* | EMFilterSourceElement cleanups. | Matthew Barnes | 2011-06-01 | 2 | -179/+185 |
| | |||||
* | Fix more places where old-style folder URIs are used. | Matthew Barnes | 2011-06-01 | 3 | -50/+20 |
| | |||||
* | Bug #649939 - Cann't create new folder | Milan Crha | 2011-05-31 | 3 | -6/+62 |
| | |||||
* | Bug #651062 - Emit operation progress on the correct cancellable | Milan Crha | 2011-05-30 | 1 | -3/+3 |
| | |||||
* | e_mail_store_add_by_account(): Fix a potential use-before-set. | Matthew Barnes | 2011-05-30 | 1 | -1/+1 |
| | |||||
* | Remove em_utils_folder_name_from_uri(). | Matthew Barnes | 2011-05-30 | 2 | -28/+0 |
| | |||||
* | Change EMEventTargetFolder contents. | Matthew Barnes | 2011-05-30 | 3 | -27/+22 |
| | | | | | | Give it a CamelStore and folder name instead of an EAccount and folder URI. Both the EAccount and folder URI can be easily retrieved from the CamelStore and folder name. | ||||
* | EMSubscriptionEditor: Manage stores, not accounts. | Matthew Barnes | 2011-05-29 | 2 | -76/+107 |
| | | | | | We'll query the accounts to get display names for the combo box, but that's it. Use CamelStores instead. | ||||
* | Add em_folder_tree_model_list_stores(). | Matthew Barnes | 2011-05-29 | 2 | -0/+10 |
| | | | | | | Lists all the CamelStores added to EMFolderTreeModel. Note that CamelStores with a corresponding EAccount are only added if the EAccount is enabled, so it's safe to assume all returned CamelStores are enabled. | ||||
* | EMFolderTreeModel: Miscellaneous cleanups. | Matthew Barnes | 2011-05-29 | 1 | -43/+13 |
| | |||||
* | Including <glib-object.h> directly is rarely needed. | Matthew Barnes | 2011-05-28 | 4 | -5/+0 |
| | |||||
* | Including <glib.h> directly is rarely needed. | Matthew Barnes | 2011-05-28 | 21 | -24/+0 |
| | |||||
* | Remove account from EMFolderTreeModelStoreInfo. | Matthew Barnes | 2011-05-28 | 2 | -7/+10 |
| | | | | | The struct already has a CamelStore, and the CamelStore UID is the same as the EAccount UID, so it's easy to lookup the corresponding EAccount. | ||||
* | EMFolderTreeModel: Remove internal account_index. | Matthew Barnes | 2011-05-28 | 1 | -26/+15 |
| | | | | The store_index is sufficient. | ||||
* | Remove display_name from EMFolderTreeModelStoreInfo. | Matthew Barnes | 2011-05-28 | 3 | -16/+3 |
| | | | | | It was only being used to look up an EAccount UID, but we already had the CamelStore, and the CamelStore UID is the same as the EAccount UID. | ||||
* | Bug #646109 - Fix use of include <config.h> to make sure translations work | Milan Crha | 2011-05-27 | 37 | -12/+116 |
| | |||||
* | Bug 651062 - refresh_folders_exec() reports progress incorrectly. | Matthew Barnes | 2011-05-26 | 1 | -3/+6 |
| | |||||
* | Bug 651001 - Cannot send message from accounts not having a provider | Lucian Langa | 2011-05-26 | 1 | -2/+8 |
| | |||||
* | Check for vfolder stores by UID, not URI. | Matthew Barnes | 2011-05-26 | 2 | -76/+80 |
| | |||||
* | Fix em_folder_selector_get_selected_uri(). | Matthew Barnes | 2011-05-25 | 1 | -35/+9 |
| | | | | | Another case of custom logic to build old-style folder URIs. The new format simplifies things considerably. | ||||
* | EMFolderSelector: Fix some silly typos. | Matthew Barnes | 2011-05-25 | 1 | -2/+2 |
| | |||||
* | Use em_folder_tree_get_selected() in places to simplify code. | Matthew Barnes | 2011-05-25 | 4 | -58/+42 |
| | | | | | | There were a few places where we were accessing the folder tree model directly to get the selected store + folder name, or were asking for the selected URI only to parse back into its store + folder name components. | ||||
* | Remove em_folder_tree_get_selected_path(). | Matthew Barnes | 2011-05-25 | 2 | -24/+0 |
| | | | | em_folder_tree_get_selected() supercedes it. | ||||
* | Add em_folder_tree_get_selected(). | Matthew Barnes | 2011-05-25 | 2 | -0/+39 |
| | | | | Returns the CamelStore and folder name of the selected row. | ||||
* | EMFolderTree: Rewrite async folder info loading. | Matthew Barnes | 2011-05-25 | 1 | -125/+157 |
| | | | | | | When a folder is expanded and child folder info needs to be retrieved, submit an EActivity and call camel_store_get_folder_info() instead of using the legacy MailMsg API. | ||||
* | Add em_folder_tree_new_activity(). | Matthew Barnes | 2011-05-24 | 2 | -0/+26 |
| | | | | | | Similar to e_mail_reader_new_activity(). Creates, configures and submits a new EActivity instance, so asynchronous operations can easily be dispatched without a lot of boilerplate code. | ||||
* | EMFolderTree: Add an EAlertSink property. | Matthew Barnes | 2011-05-24 | 5 | -10/+77 |
| | | | | | Now EMFolderTree has access to both an EShellBackend and an EAlertSink; everything it needs to build and submit EActivity instances. | ||||
* | Let EMFolderSelector create its own EMFolderTree. | Matthew Barnes | 2011-05-24 | 7 | -252/+285 |
| | | | | | Also, minimize the EMFolderSelector API by removing frivolous wrapper functions and unused functions. | ||||
* | EMFolderTree: Whitespace cleanups. | Matthew Barnes | 2011-05-24 | 1 | -6/+9 |
| | |||||
* | EMFolderTree: Store an EMailBackend instead of an EMailSession. | Matthew Barnes | 2011-05-24 | 30 | -345/+364 |
| | | | | | | | | All this so EMFolderTree can submit EActivity instances for async ops. You can obtain an EMailSession from an EMailBackend, but not vice versa. Creates lots of pretty ripples in the mail code, but ultimately reduces complexity. So it's a code cleanup of sorts. | ||||
* | Remove emfu_create_folder_real(). | Matthew Barnes | 2011-05-24 | 3 | -187/+231 |
| | | | | Use e_mail_store_create_folder() instead. | ||||
* | Fix crash when opening message window. | Matthew Barnes | 2011-05-22 | 1 | -2/+2 |
| | | | | Would help if I actually did what the comment said... | ||||
* | Coding style and whitespace cleanup. | Matthew Barnes | 2011-05-22 | 18 | -135/+335 |
| | |||||
* | EMailReader: Remove the forward/reply style hack. | Matthew Barnes | 2011-05-21 | 1 | -24/+23 |
| | | | | | Now that we're configuring EMailReader instances from an idle callback, we can safely store the forward and reply styles in the private struct. | ||||
* | Bug 650587 - Hide Search Folder actions when Search Folders are disabled | Matthew Barnes | 2011-05-21 | 5 | -53/+86 |
| | | | | | | | | | | | | | | | | Add an action group for Search Folders to EMailReader. The action group's visibility is bound to the "mail-enable-search-folders" setting, so that menu items related to Search Folders are hidden when Search Folders are disabled in GConf. Affected menu items are: Edit -> Search Folders Message -> Create Rule -> Search Folder from Subject... Message -> Create Rule -> Search Folder from Sender... Message -> Create Rule -> Search Folder from Recipients... Message -> Create Rule -> Search Folder from Mailing List... Search -> Create Search Folder From Search... | ||||
* | EMailReader: Support multiple action groups. | Matthew Barnes | 2011-05-21 | 7 | -38/+67 |
| | | | | | | Use an enum type to request different action groups. For now we just have E_MAIL_READER_ACTION_GROUP_STANDARD. EMailReader implementations should map the enum value to an appropriate GtkActionGroup. | ||||
* | mail-autofilter.c: Add argument guards in public functions. | Matthew Barnes | 2011-05-21 | 1 | -1/+13 |
| | | | | | | | | | This is related to bug #650587, but is not a proper fix. The proper fix is in the next couple commits about EMailReader action groups. This commit just trades a crash for a runtime warning, but can be backported to the stable branch, whereas the changes required for the proper fix are too extensive to backport. | ||||
* | Remove mail_remove_folder(). | Matthew Barnes | 2011-05-21 | 11 | -279/+352 |
| | | | | Use e_mail_folder_remove() instead. | ||||
* | Always initialized all structure members | Milan Crha | 2011-05-19 | 1 | -1/+1 |
| | |||||
* | Bug 650522 - em-format-html: Fix uninitialized variable | Colin Walters | 2011-05-19 | 1 | -1/+1 |
| | |||||
* | Remove mail_get_folderinfo(). | Matthew Barnes | 2011-05-19 | 3 | -131/+55 |
| | | | | Use camel_store_get_folder_info() instead. | ||||
* | Remove mail_save_messages(). | Matthew Barnes | 2011-05-18 | 8 | -238/+378 |
| | | | | Use e_mail_folder_save_messages() instead. | ||||
* | Remove mail_store_prepare_offline(). | Matthew Barnes | 2011-05-18 | 5 | -85/+89 |
| | | | | Use e_mail_store_prepare_for_offline() instead. | ||||
* | Remove mail_check_service(). | Matthew Barnes | 2011-05-18 | 3 | -146/+73 |
| | | | | Use camel_service_query_auth_types() instead. | ||||
* | Remove mail_remove_attachments(). | Matthew Barnes | 2011-05-17 | 7 | -149/+309 |
| | | | | Use e_mail_folder_remove_attachments() instead. | ||||
* | Bug #601541 - Add 'Copy Image' Option On Inline Email Images | Milan Crha | 2011-05-16 | 1 | -0/+6 |
| | |||||
* | Remove mail_get_folder_quota(). | Matthew Barnes | 2011-05-15 | 2 | -83/+0 |
| | | | | Use camel_folder_get_quota_info() instead. | ||||
* | EMFolderProperties: Fetch quota information asynchronously. | Matthew Barnes | 2011-05-15 | 1 | -11/+52 |
| | |||||
* | Remove mail_get_message(). | Matthew Barnes | 2011-05-14 | 2 | -85/+0 |
| | | | | Use camel_folder_get_message() instead. | ||||
* | Reimplement the "mail-reply-sender" action. | Matthew Barnes | 2011-05-14 | 1 | -47/+79 |
| | | | | Now uses camel_folder_get_message(). | ||||
* | Reimplement the "mail-reply-all" action. | Matthew Barnes | 2011-05-14 | 1 | -33/+59 |
| | | | | Now uses camel_folder_get_message(). | ||||
* | Bug #646033 - Update progress in Send/Receive dialog | Milan Crha | 2011-05-13 | 1 | -0/+16 |
| | |||||
* | Keep forgetting to add prefixes to EAlert tags. | Matthew Barnes | 2011-05-13 | 3 | -5/+5 |
| | |||||
* | Miscellaneous cleanups. | Matthew Barnes | 2011-05-13 | 4 | -72/+81 |
| | |||||
* | em_format_html_print_message(): Require a CamelMimeMessage. | Matthew Barnes | 2011-05-13 | 4 | -49/+91 |
| | | | | | | Let EMailReader fetch the CamelMimeMessage itself, handle errors, and then pass it off to EMFormatHTMLPrint. This also eliminates the need for em_format_html_print_raw_message(). | ||||
* | em_utils_reply_to_message(): Require a CamelMimeMessage. | Matthew Barnes | 2011-05-13 | 4 | -76/+15 |
| | | | | | No more fetching a message itself. Oh, and stop unreffing the message. Those kinds of insane semantics are what lead to crashes. | ||||
* | Remove em_utils_redirect_message_by_uid(). | Matthew Barnes | 2011-05-13 | 2 | -42/+0 |
| | | | | Use em_utils_redirect_message() instead. | ||||
* | Reimplement the "mail-redirect" action. | Matthew Barnes | 2011-05-13 | 1 | -8/+59 |
| | | | | | Now fetches the message itself using camel_folder_get_message(), then calls em_utils_redirect_message(). | ||||
* | Add e_mail_reader_new_activity(). | Matthew Barnes | 2011-05-13 | 4 | -76/+54 |
| | | | | | | | | | | | | | | | | Configuring and submitting an EActivity for every mail operation is getting tedious. This function helps reduce boilerplate code by: * Creating a new EActivity instance. * Installing an EAlertSink using e_mail_reader_get_alert_sink(). * Installing a GCancellable (which is really a CamelOperation). * Submitting the activity via e_shell_backend_add_activity(). I'm considering adding a similar function (or class method) for EShellView. Not sure yet... | ||||
* | Reimplement e_mail_reader_create_vfolder_from_selected(). | Matthew Barnes | 2011-05-13 | 1 | -5/+0 |
| | | | | Now uses camel_folder_get_message(). | ||||
* | Reimplement e_mail_reader_create_vfolder_from_selected(). | Matthew Barnes | 2011-05-13 | 1 | -24/+75 |
| | | | | Now uses camel_folder_get_message(). | ||||
* | Reimplement e_mail_reader_create_filter_from_selected(). | Matthew Barnes | 2011-05-13 | 1 | -33/+72 |
| | | | | Now uses camel_folder_get_message(). | ||||
* | EMConfigTargetFolder: Remove URI member. | Matthew Barnes | 2011-05-13 | 3 | -11/+3 |
| | | | | | Use e_mail_folder_uri_from_folder() if you really need a folder URI for the target's CamelFolder. | ||||
* | Bug #645476 - Avoid scroll to cursor on folder change in message list | Milan Crha | 2011-05-12 | 1 | -12/+15 |
| | |||||
* | Cannot send message with just enabled account | Milan Crha | 2011-05-12 | 3 | -56/+46 |
| | | | | | | | | | | | | | Everything in UI seemed as working fine, but the message is just lost, even there was printed a runtime warning on the console. This is fixing couple things along this issue: - differentiate between NULL and invalid pointers/objects in new e_mail_folder_uri_...() functions - report error to UI if mail_session_send_to_thread() fails to find corresponding transport service - call e_mail_store_add_by_account() in mail_store_load_accounts() (a side-effect of this change is no code duplication and unified processing of the same action) | ||||
* | e_mail_session_uri_to_folder_sync(): Remove redundant status message. | Matthew Barnes | 2011-05-12 | 1 | -5/+0 |
| | | | | camel_store_get_folder() pushes an "Opening folder" message itself. | ||||
* | Remove mail_get_folder(). | Matthew Barnes | 2011-05-12 | 2 | -87/+0 |
| | | | | Use camel_store_get_folder() instead. | ||||
* | Reimplement em_folder_properties_show(). | Matthew Barnes | 2011-05-12 | 2 | -100/+196 |
| | | | | | Now uses camel_store_get_folder() and camel_folder_get_quota_info(), although I need to rewrite the quota function to be asynchronous. | ||||
* | Get vfolder_edit_rule() working again. | Matthew Barnes | 2011-05-12 | 2 | -65/+62 |
| | | | | | | It was handling folder URIs the old way. Also, use gtk_dialog_run() to simplify the logic. | ||||
* | Fix some GPtrArray leaks. | Matthew Barnes | 2011-05-12 | 2 | -23/+50 |
| | |||||
* | Add e_activity_handle_cancellation(). | Matthew Barnes | 2011-05-12 | 4 | -35/+15 |
| | | | | | | | | Convenience function for use in GAsyncReadyCallback functions. This acknowledges the cancellation, so that the activity's description changes from "(cancelling)" to "(cancelled)" and the description appears crossed out in the UI for a moment before disappearing. | ||||
* | Remove mail_get_messages(). | Matthew Barnes | 2011-05-12 | 2 | -99/+0 |
| | | | | Use e_mail_folder_get_multiple_messages() instead. | ||||
* | Remove mail_build_attachment(). | Matthew Barnes | 2011-05-12 | 2 | -67/+0 |
| | | | | Use e_mail_folder_build_attachment() instead. | ||||
* | Reimplement em_utils_edit_messages(). | Matthew Barnes | 2011-05-12 | 5 | -68/+86 |
| | | | | Now uses e_mail_folder_get_multiple_messages(). | ||||
* | Add a 'message_uid' param to em_utils_edit_message(). | Matthew Barnes | 2011-05-12 | 2 | -53/+48 |
| | | | | | So we can remove the internal edit_message() function and do the work directly in em_utils_edit_message(). | ||||
* | Reimplement em_utils_forward_messages(). | Matthew Barnes | 2011-05-12 | 4 | -118/+189 |
| | | | | | Now uses e_mail_folder_build_attachment() and e_mail_folder_get_multiple_messages(). | ||||
* | Add e_mail_folder_build_attachment(). | Matthew Barnes | 2011-05-12 | 2 | -0/+186 |
| | | | | Replaces mail_build_attachment() from mail-ops.c. | ||||
* | EMailReader: Reimplement "mail-remove-duplicates" action. | Matthew Barnes | 2011-05-12 | 4 | -151/+166 |
| | | | | Now uses e_mail_folder_find_duplicate_messages(). | ||||
* | Add e_mail_folder_find_duplicate_messages(). | Matthew Barnes | 2011-05-12 | 2 | -0/+218 |
| | | | | Moves the non-interactive logic out of EMailReader. | ||||
* | Add e_mail_folder_get_multiple_messages(). | Matthew Barnes | 2011-05-12 | 2 | -0/+154 |
| | | | | Replaces mail_get_messages() from mail-ops.c. | ||||
* | Bug #649939 - Cann't create new folder (second shot) | Milan Crha | 2011-05-11 | 2 | -3/+12 |
| | | | | | The previous patch worked for local account only, for anything which has '@' in account's UID it still failed. | ||||
* | Bug #649952 - Do not unref result of camel_session_get_service() | Milan Crha | 2011-05-11 | 2 | -1/+2 |
| | |||||
* | Bug #649939 - Cann't create new folder | Milan Crha | 2011-05-11 | 1 | -41/+14 |
| | |||||
* | "email://" URIs have encoded paths too. | Matthew Barnes | 2011-05-09 | 1 | -1/+1 |
| | |||||
* | Encode the path part of folder URIs. | Matthew Barnes | 2011-05-09 | 1 | -8/+16 |
| | | | | | | | | | | | | Wasn't sure if this was necessary, but it -is- in order to handle the local Junk and Trash vfolder names correctly: .#evolution/Junk .#evolution/Trash If we don't escape the path and we feed camel_url_new() something like "folder://local/.#evolution/Trash", it's gonna think the path is '.' and the rest of it's a fragment. | ||||
* | Coding style cleanups. | Matthew Barnes | 2011-05-09 | 35 | -470/+470 |
| | |||||
* | Whitespace and coding style cleanups. | Matthew Barnes | 2011-05-08 | 18 | -75/+168 |
| | |||||
* | Adapt to CamelFolder:name -> display-name. | Matthew Barnes | 2011-05-07 | 5 | -6/+8 |
| | |||||
* | Adapt to CamelFolderInfo.name -> display_name. | Matthew Barnes | 2011-05-07 | 3 | -15/+18 |
| | |||||
* | mail-send-recv.c:get_folders(): Adapt to CamelVeeStore change. | Matthew Barnes | 2011-05-07 | 1 | -8/+7 |
| | | | | See E-D-S commit 26c74be4066dff41dd1e9c9adc1c2c116142ba60. | ||||
* | MailFolderCache: Drop folder URI in "folder-changed" signal. | Matthew Barnes | 2011-05-07 | 2 | -33/+24 |
| | | | | | We already include a CamelStore and folder name string in the signal arguments, so it's trivial to reconstruct the URI if it's needed. | ||||
* | Remove em_folder_tree_get_selected_folder_info(). | Matthew Barnes | 2011-05-07 | 2 | -45/+0 |
| | | | | Function is no longer used, or wanted. | ||||
* | em_folder_utils_create_folder(): Change function parameters. | Matthew Barnes | 2011-05-07 | 3 | -9/+15 |
| | | | | | Take a folder URI string instead of a CamelFolderInfo, and swap places with the GtkWindow parameter. | ||||
* | em_folder_utils_copy_folder(): Change function parameter. | Matthew Barnes | 2011-05-07 | 2 | -31/+48 |
| | | | | Take a folder URI string instead of a CamelFolderInfo. | ||||
* | Adapt to X-Evolution-Source headers storing UIDs. | Matthew Barnes | 2011-05-06 | 2 | -33/+13 |
| | |||||
* | Remove uid_cachename_hack(). | Matthew Barnes | 2011-05-06 | 1 | -24/+7 |
| | | | | | | It was building the old CamelStore path based on the URI. Gone before 0.11 my ass. | ||||
* | fetch_mail_exec(): Remove hack for local Inbox. | Matthew Barnes | 2011-05-06 | 1 | -92/+66 |
| | | | | | | Don't call camel_filter_driver_filter_mbox() on the local Inbox since the local Inbox is no longer an mbox. Just treat it like any other folder. | ||||
* | Remove em_uri_from_camel() and em_uri_to_camel(). | Matthew Barnes | 2011-05-06 | 2 | -146/+0 |
| | | | | Functions are no longer used, or wanted. | ||||
* | mail-config.c: Don't try to rename obsolete config files. | Matthew Barnes | 2011-05-06 | 1 | -10/+3 |
| | |||||
* | MailFolderCache: Emit folder names instead of URIs in signals. | Matthew Barnes | 2011-05-06 | 6 | -230/+202 |
| | |||||
* | mail-config.c: Code cleanups. | Matthew Barnes | 2011-05-06 | 1 | -105/+108 |
| | |||||
* | mail-vfolder.c: Coding style cleanups. | Matthew Barnes | 2011-05-06 | 1 | -20/+16 |
| | |||||
* | Simplify vfolder_adduri_desc(). | Matthew Barnes | 2011-05-06 | 1 | -37/+30 |
| | |||||
* | Simplify em_vfolder_rule_from_address(). | Matthew Barnes | 2011-05-06 | 1 | -4/+2 |
| | |||||
* | Simplify em_vfolder_rule_from_message(). | Matthew Barnes | 2011-05-06 | 1 | -4/+2 |
| | |||||
* | Simplify e_mail_session_unsubscribe_folder_sync(). | Matthew Barnes | 2011-05-06 | 1 | -31/+18 |
| | |||||
* | e_mail_local_init(): Use the new folder URI format. | Matthew Barnes | 2011-05-06 | 1 | -5/+5 |
| | |||||
* | EMVFolderRule: Use the new folder URI format. | Matthew Barnes | 2011-05-06 | 1 | -16/+17 |
| | |||||
* | EMFilterFolderElement: Use the new folder URI format. | Matthew Barnes | 2011-05-06 | 3 | -45/+8 |
| | | | | No longer need to distinguish between Camel URIs and Evolution URIs. | ||||
* | EMFolderTreeModel: Use the new folder URI format. | Matthew Barnes | 2011-05-06 | 1 | -5/+9 |
| | | | | Disregard CamelFolderInfo.uri strings. | ||||
* | Introduce a new, simpler folder URI format. | Matthew Barnes | 2011-05-06 | 2 | -8/+65 |
| | | | | | | | | | | | | | | | | Folder URIs shall henceforth be exclusive to Evolution. The new format is: 'folder://' CAMEL_STORE_UID '/' CAMEL_FOLDER_PATH Add e_mail_folder_uri_build() to construct such a URI from a CamelStore and folder path string, change e_mail_folder_uri_from_folder() to build the new URI, and teach e_mail_folder_uri_parse() to parse it. e_mail_folder_uri_parse() will continue to know how to parse the older URI formats still present in config files and GConf keys. This captures the legacy knowledge neatly into one function. | ||||
* | EMAccountEditor: Fix a runtime warning. | Matthew Barnes | 2011-05-06 | 1 | -2/+5 |
| | | | | | | Before selecting a URI in the EMFolderSelectionButton for Drafts and Sent folders, install an EMailSession in each button which is needed for parsing URIs. | ||||
* | Random little coding style cleanups. | Matthew Barnes | 2011-05-06 | 4 | -32/+35 |
| | |||||
* | EMailDisplay: Coding style cleanup. | Matthew Barnes | 2011-05-06 | 1 | -1/+2 |
| | |||||
* | EMFolderTreeModel: Avoid e_get_account_by_source_url(). | Matthew Barnes | 2011-05-06 | 1 | -1/+3 |
| | | | | Use e_get_account_by_uid() instead. | ||||
* | EMFolderTreeModel: Always populate the CamelStore column. | Matthew Barnes | 2011-05-06 | 1 | -4/+3 |
| | | | | | Even in 'Loading...' rows. This way we know the CamelStore is present in all rows, and don't have to test for NULL. | ||||
* | Simplify em_folder_tree_model_set_folder_info(). | Matthew Barnes | 2011-05-06 | 1 | -6/+4 |
| | | | | | e_mail_folder_uri_equal() uses e_mail_folder_uri_parse() to parse both URIs, so we can just hand it an 'email://' URI directly. | ||||
* | Simplify em_utils_folder_is_sent(). | Matthew Barnes | 2011-05-06 | 1 | -9/+4 |
| | | | | | e_mail_folder_uri_equal() uses e_mail_folder_uri_parse() to parse both URIs, so we can just hand it an 'email://' URI directly. | ||||
* | Simplify em_utils_folder_is_drafts(). | Matthew Barnes | 2011-05-06 | 1 | -8/+3 |
| | | | | | e_mail_folder_uri_equal() uses e_mail_folder_uri_parse() to parse both URIs, so we can just hand it an 'email://' URI directly. | ||||
* | Simplify em_utils_folder_is_templates(). | Matthew Barnes | 2011-05-06 | 1 | -8/+3 |
| | | | | | e_mail_folder_uri_equal() uses e_mail_folder_uri_parse() to parse both URIs, so we can just hand it an 'email://' URI directly. | ||||
* | Simplify emae_account_folder(). | Matthew Barnes | 2011-05-06 | 1 | -7/+2 |
| | | | | | EMFolderSelectionButton uses e_mail_folder_uri_parse(), so we can just hand it an 'email://' URI directly. | ||||
* | Simplify e_mail_session_uri_to_folder_sync(). | Matthew Barnes | 2011-05-06 | 1 | -67/+13 |
| | | | | | | This relies on e_mail_folder_uri_parse() to handle 'email://' URIs. See the previous commit. | ||||
* | Teach e_mail_folder_uri_parse() to parse 'email://' URIs. | Matthew Barnes | 2011-05-06 | 1 | -9/+60 |
| | |||||
* | Simplify em_folder_tree_set_selected_list(). | Matthew Barnes | 2011-05-06 | 1 | -59/+38 |
| | |||||
* | Bug #627952 - 'Local delivery' mbox's aren't read properly | Milan Crha | 2011-05-05 | 2 | -7/+15 |
| | |||||
* | Use e_mail_folder_uri_from_folder() instead of camel_folder_get_uri(). | Matthew Barnes | 2011-05-04 | 6 | -46/+48 |
| | |||||
* | Remove EMFolderTreeModel::folder-added signal. | Matthew Barnes | 2011-05-04 | 2 | -18/+0 |
| | | | | No one was listening. | ||||
* | EMFolderSelectionButton: Avoid e_get_account_by_source_url(). | Matthew Barnes | 2011-05-04 | 1 | -10/+19 |
| | | | | Use e_get_account_by_uid() instead. | ||||
* | MessageList: Simplify the "Location" column. | Matthew Barnes | 2011-05-04 | 1 | -25/+18 |
| | |||||
* | Drop 'folder_uri' member from MessageList. | Matthew Barnes | 2011-05-04 | 5 | -40/+31 |
| | |||||
* | Remove e_mail_reader_get_folder_uri(). | Matthew Barnes | 2011-05-04 | 4 | -43/+35 |
| | | | | | Instead call e_mail_reader_get_folder() and, if you really need to, generate the folder URI with e_mail_folder_uri_from_folder(). | ||||
* | Build vfolder rules with CamelFolders instead of folder URIs. | Matthew Barnes | 2011-05-04 | 6 | -28/+35 |
| | |||||
* | Remove 'from_uri' params from e-msg-composer-utils.c. | Matthew Barnes | 2011-05-04 | 4 | -67/+65 |
| | | | | | Pass CamelFolder objects instead, which are already available at almost every call site. | ||||
* | Change em_folder_tree_model_user_marked_unread() params. | Matthew Barnes | 2011-05-03 | 4 | -7/+11 |
| | | | | Take a CamelFolder instead of a folder URI string. | ||||
* | Fix a runtime warning in e_mail_reader_check_state(). | Matthew Barnes | 2011-05-03 | 1 | -6/+6 |
| | | | | | Don't call em_utils_folder_is_drafts() or em_utils_folder_is_outbox() if the CamelFolder is NULL. | ||||
* | Fix compiler warnings. | Matthew Barnes | 2011-05-03 | 5 | -21/+1 |
| | | | | Mostly dead assignments. | ||||
* | Drop 'folder_uri' param from em_utils_folder_is_outbox(). | Matthew Barnes | 2011-05-03 | 9 | -34/+21 |
| | |||||
* | Drop 'folder_uri' param from em_utils_folder_is_sent(). | Matthew Barnes | 2011-05-03 | 6 | -14/+15 |
| | |||||
* | Drop 'folder_uri' param from em_utils_folder_is_templates(). | Matthew Barnes | 2011-05-03 | 5 | -12/+14 |
| | |||||
* | Drop 'folder_uri' param from em_utils_folder_is_drafts(). | Matthew Barnes | 2011-05-03 | 9 | -26/+24 |
| | |||||
* | em-utils.c: Simplify guess_account_from_folder(). | Matthew Barnes | 2011-05-03 | 1 | -13/+5 |
| | |||||
* | em-utils.c: More coding style cleanups. | Matthew Barnes | 2011-05-03 | 1 | -8/+17 |
| | |||||
* | Replace camel_store_folder_uri_equal() with e_mail_folder_uri_equal(). | Matthew Barnes | 2011-05-03 | 3 | -67/+87 |
| | |||||
* | em-utils.c: Coding style cleanups. | Matthew Barnes | 2011-05-03 | 1 | -66/+71 |
| | |||||
* | Add some handy folder URI utility functions. | Matthew Barnes | 2011-05-03 | 2 | -0/+165 |
| | | | | | | | | | | | | | | | | | e_mail_folder_uri_parse() Parses a folder URI and returns a corresponding CamelStore instance and folder name string, or else sets a GError. e_mail_folder_uri_equal() Compares two folder URIs for equality. Replaces camel_store_folder_uri_equal(). e_mail_folder_uri_from_folder() This will eventually replace camel_folder_get_uri(), but for now it just calls camel_folder_get_uri() and duplicates the URI string. | ||||
* | Drop 'folder_uri' param from message_list_set_folder(). | Matthew Barnes | 2011-05-03 | 3 | -8/+14 |
| | |||||
* | MessageList coding style cleanups. | Matthew Barnes | 2011-05-03 | 1 | -12/+12 |
| | |||||
* | Remove e_mail_reader_set_folder_uri(). | Matthew Barnes | 2011-05-03 | 2 | -32/+0 |
| | | | | Function is no longer used, or wanted. | ||||
* | EMailShellView: Open the selected folder ourselves. | Matthew Barnes | 2011-05-03 | 9 | -56/+74 |
| | | | | | | | | | | | | | | | | | This one's a little involved: - EMailShellView now obtains a CamelFolder itself in response to EMFolderTree::folder-selected signals. Uses EActivity to do so. - Revise EMFolderTree::folder-selected signal arguments to be more useful: emit a CamelStore object instead of a folder URI. - Also revise EMFolderTree::folder-activiated signal arguments the same way while we're at it. - Remove the "folder_uri" argument from e_mail_reader_set_folder(). If you have a CamelFolder object you can obtain the URI string by calling camel_folder_get_uri(). | ||||
* | Add em_folder_tree_get_selected_account(). | Matthew Barnes | 2011-05-03 | 2 | -0/+28 |
| | | | | Comes in handy for a few EMailShellView actions. | ||||
* | EMFolderTree: Coding style cleanups. | Matthew Barnes | 2011-05-03 | 1 | -6/+10 |
| | |||||
* | EMailSession: Fix popb4smtp authentication. | Matthew Barnes | 2011-05-03 | 1 | -6/+1 |
| | | | | | Forgot I had already made CamelSaslPOPB4SMTP expect a CamelSource UID from camel_session_get_password(). | ||||
* | Simplify mail_session_get_password(). | Matthew Barnes | 2011-05-03 | 1 | -16/+13 |
| | | | | | Utilizes the new capability in e_get_account_by_uid() to handle both CamelStore and CamelTransport UIDs. | ||||
* | EMConfigTargetAccount: Add original_account member. | Matthew Barnes | 2011-05-03 | 3 | -15/+35 |
| | | | | | | | Rename the existing 'account' member to 'modified_account' and add an 'original_account' member so plugins have direct access to both. Mostly of benefit to the imap-features plugin. | ||||
* | EMConfig coding style cleanups. | Matthew Barnes | 2011-05-03 | 2 | -86/+92 |
| | |||||
* | EMEventTargetFolder: Add an EAccount member. | Matthew Barnes | 2011-05-03 | 3 | -1/+15 |
| | | | | | The mail-notification plugin can use the EAccount member directly instead of searching for it by URI. | ||||
* | EMEvent coding style cleanups. | Matthew Barnes | 2011-05-03 | 2 | -72/+106 |
| | |||||
* | MailFolderCache: Remove 'folders_uri' hash table | Matthew Barnes | 2011-05-02 | 1 | -11/+0 |
| | | | | | We've been adding and removing folder URIs to this hash table but never actually using it for anything. Not a single lookup. So just remove it. | ||||
* | Bug 649046 - crash on startup with latest CamelURL modifications | Lucian Langa | 2011-05-02 | 1 | -1/+0 |
| | |||||
* | EMFolderSelectionButton: Remove unused multiselect functions. | Matthew Barnes | 2011-04-30 | 2 | -153/+25 |
| | |||||
* | Adapt to extra arg in camel_session_get_service_by_url(). | Matthew Barnes | 2011-04-29 | 4 | -6/+7 |
| | |||||
* | Bug #588891 - Spam settings dialog terribly un-higgy | Dan Vrátil | 2011-04-29 | 1 | -0/+120 |
| | |||||
* | Bug 648756 - Custom imap port forgotten | Dan Vrátil | 2011-04-29 | 1 | -4/+6 |
| | |||||
* | Bug 597082 - Crash while migrating folder info | Matthew Barnes | 2011-04-28 | 1 | -11/+25 |
| | | | | | | | | In migrate_folders(), free the idle callback closure using a GDestroyNotify callback so we don't try to free the same memory repeatedly if the idle callback recurses while cycling the main loop. Why *are* we cycling the main loop anyway? I don't get that part. | ||||
* | Bug #303862 - Cannot scroll message after clicking image attachment button | Dan Vrátil | 2011-04-28 | 1 | -0/+34 |
| | |||||
* | Bug #303653 - Make headers collapsable in preview pane | Dan Vrátil | 2011-04-27 | 6 | -6/+193 |
| | |||||
* | Remove redundant EAccountList utilities. | Matthew Barnes | 2011-04-26 | 1 | -6/+4 |
| | | | | | Kill itip_addresses_get() and itip_addresses_get_default(), and use e_get_account_list() and e_get_default_account() instead. | ||||
* | EMailBackend: Ignore cancelled background jobs. | Matthew Barnes | 2011-04-25 | 1 | -1/+4 |
| | |||||
* | Adapt to new CamelSession background job API. | Matthew Barnes | 2011-04-24 | 2 | -65/+119 |
| | |||||
* | Bug 547954 - Clarify delete-from-search-folder warning | Dan Vrátil | 2011-04-23 | 2 | -5/+4 |
| | |||||
* | e_mail_local_init(): Improve error handling. | Matthew Barnes | 2011-04-23 | 1 | -8/+13 |
| | |||||
* | Bug 648308 - Do not display full folder URI in "Opening folder" activity | Dan Vrátil | 2011-04-22 | 1 | -2/+7 |
| | |||||
* | Adapt to CamelService changes. | Matthew Barnes | 2011-04-21 | 23 | -570/+542 |
| | |||||
* | Bug 648346 - Add style class to message browser toolbar | Matthew Barnes | 2011-04-21 | 1 | -0/+4 |
| | |||||
* | Bug #641154 - Crash in emae_check_authtype_done | Milan Crha | 2011-04-21 | 1 | -2/+22 |
| | |||||
* | Bug #647429 - Hide port-entry for providers without port | Dan Vrátil | 2011-04-19 | 1 | -13/+13 |
| | |||||
* | Adapt to sealed up CamelService. | Matthew Barnes | 2011-04-18 | 12 | -44/+124 |
| | |||||
* | Bug 647816 - Moving folder hierarchy causes error | David Woodhouse | 2011-04-15 | 1 | -2/+9 |
| | | | | | When *moving*, as opposed to copying, we only need to operate on the top-level folder; its children will automatically follow it. | ||||
* | Don't try to refresh or sync mail folders when offline. | Matthew Barnes | 2011-04-14 | 2 | -2/+10 |
| | | | | | Switching between mail folders in offline mode produces lots of annoying alerts for operations we shouldn't even be attempting. | ||||
* | Demonstrate EWebView as an EAlertSink. | Matthew Barnes | 2011-04-14 | 2 | -11/+9 |
| | |||||
* | Remove the profiler plugin. | Matthew Barnes | 2011-03-29 | 1 | -11/+0 |
| | | | | | | | This plugin was for developers, but no one uses it anymore. Plus the only profiling hooks left in Evolution were in the MessageList widget, which performs fine. There's better ways to collect profiling data these days anyway (sysprof, systemtap, etc.). | ||||
* | Miscellaneous GtkAction-related cleanups. | Matthew Barnes | 2011-03-28 | 1 | -18/+18 |
| | | | | Prefer the newer GtkAction "set" functions over g_object_set(). | ||||
* | Restore lockdown integration. | Matthew Barnes | 2011-03-28 | 2 | -35/+41 |
| | | | | | | | | | | | | | With lockdown settings available through GSettings, widgets can handle lockdown integration themselves without having to use EShellSettings. Also fixed a few places where printing or save-to-disk actions were either not properly wired up or not responding to lockdown settings, but much more work needs done. Attachments, for example, are not honoring the disable-save-to-disk setting at all. This too requires the recently-added gsettings-desktop-schemas dependency. | ||||
* | Change "mail:async-error" alerts to warnings. | Matthew Barnes | 2011-03-26 | 1 | -2/+2 |
| | | | | Most Camel alerts are transient. Make them warnings so they time out. | ||||
* | Fix alignment of extra widgets in EAlertDialogs. | Matthew Barnes | 2011-03-25 | 3 | -46/+61 |
| | | | | | | | Add e_alert_dialog_get_content_area(), which returns the GtkVBox containing the primary and secondary labels. Use this instead of gtk_dialog_get_content_area() to maintain the dialog's left margin beneath the image. | ||||
* | Bug 418954 - Add a separate entry combo for port numbers | Dan Vráti | 2011-03-24 | 2 | -52/+160 |
| | | | | | | | | | Adds a new EPortEntry widget which appears alongside "host" entry boxes so users don't have to know about the "host:port" syntax to specify a custom port number. Currently only used in the mail account editor, but we'll generalize it futher so it can be used everywhere. | ||||
* | Select IMAP+ by default in new account setup. | Matthew Barnes | 2011-03-21 | 1 | -1/+2 |
| | | | | | | It's high time we promote IMAP+ over the older IMAP provider. Migration of existing IMAP accounts to IMAP+ will come in a future release. This is a first step. | ||||
* | Save account list when changing account after password prompt | Milan Crha | 2011-03-17 | 1 | -1/+3 |
| | | | | | It was necessary to propagate the change into evolution-exchange, as found within bug #644644 | ||||
* | Workaround for bug #644792 - [mail-notify] Crash when sending D-Bus message | Milan Crha | 2011-03-15 | 1 | -7/+15 |
| | |||||
* | Bug #223838 - Do not share global Sent folder view with regular folders | Milan Crha | 2011-03-10 | 1 | -6/+6 |
| | |||||
* | Bug #615204 - Adding AOL mail account as IMAP results in POP account | Milan Crha | 2011-03-10 | 1 | -1/+1 |
| | |||||
* | Minor glitches in Account Editor | Milan Crha | 2011-03-10 | 1 | -19/+19 |
| | | | | | | - hotmail username is user's email - preselected account type didn't rebuild pages, thus for hotmail POP3 was shown IMAP options | ||||
* | Do not prompt for offline when mail backend not started | Milan Crha | 2011-03-09 | 1 | -1/+1 |
| | |||||
* | Bug 643507 - Font preferences don't work | Matthew Barnes | 2011-03-09 | 1 | -96/+0 |
| | |||||
* | Bug 644053 - Fix packing in "Network Preferences" | Matthew Barnes | 2011-03-07 | 1 | -1/+14 |
| | |||||
* | Coding style and whitespace cleanup. | Matthew Barnes | 2011-03-06 | 34 | -1145/+1320 |
| | |||||
* | Construct attachment bars for correct message part ids | Milan Crha | 2011-03-04 | 1 | -2/+9 |
| | |||||
* | Do not flush Outbox when mail shell backend not started | Milan Crha | 2011-03-04 | 1 | -1/+4 |
| | |||||
* | Bug #643218 - Local delivery doesn't deliver after maildir migration | Milan Crha | 2011-03-03 | 6 | -5/+37 |
| | |||||
* | Bug #643402 - Fails to build with --disable-smime | Milan Crha | 2011-03-03 | 2 | -8/+8 |
| | |||||
* | Bug #643635 - Typo in the code from commit for bug #434972 | Milan Crha | 2011-03-02 | 1 | -1/+1 |
| | |||||
* | Do not leak attachments in a mail view | Milan Crha | 2011-03-02 | 3 | -9/+99 |
| | |||||
* | Let Esc behave like Cancel in Reply questions and do not leak message | Milan Crha | 2011-03-01 | 1 | -3/+9 |
| | |||||
* | Slightly smaller dialogs for Reply type questions (but not all) | Milan Crha | 2011-03-01 | 1 | -5/+5 |
| | |||||
* | Bug #641374 - "Send new mail to..." popup action doesn't work | Milan Crha | 2011-02-28 | 1 | -16/+38 |
| | |||||
* | Bug #643297 - multipart/related formatter skips the last part | Milan Crha | 2011-02-28 | 1 | -1/+1 |
| | |||||
* | Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly | Milan Crha | 2011-02-25 | 32 | -247/+121 |
| | |||||
* | Use G_SIGNAL_TYPE_STATIC_SCOPE for all GdkEvent signal params. | Matthew Barnes | 2011-02-25 | 1 | -8/+9 |
| | | | | | I thought this might be the cause of bug #643089. Turns out it wasn't, but it's a good thing to do anyway. | ||||
* | Bug #641343 - Cannot scroll to bottom of folder list while dragging | Milan Crha | 2011-02-23 | 1 | -10/+1 |
| | |||||
* | Bug #434972 - Reply does not detect "RE :" subject prefix | Milan Crha | 2011-02-22 | 2 | -5/+26 |
| | |||||
* | Coding style and whitespace cleanup. | Matthew Barnes | 2011-02-19 | 3 | -5/+12 |
| | |||||
* | Bug #642121 - Won't build with --with-clutter due missing include | Dan Vrátil | 2011-02-18 | 1 | -0/+1 |
| | |||||
* | Bug 642566 - Picture Gallery, not Image Gallery | Matthew Barnes | 2011-02-18 | 1 | -1/+1 |
| | |||||
* | Bug #638307 - Error when sending mail after converting to maildir | Milan Crha | 2011-02-17 | 1 | -2/+2 |
| | |||||
* | Bug #642088 - Crash when changing advanced send options in GroupWise | Milan Crha | 2011-02-17 | 1 | -0/+3 |
| | |||||
* | Bug #638478 - During sending fails to parse X-Evolution-PostTo field | Milan Crha | 2011-02-17 | 1 | -1/+1 |
| | |||||
* | Bug #638391 - Always passing NULL to emu_addr_cancel_book() | Milan Crha | 2011-02-16 | 1 | -5/+9 |
| | |||||
* | Bug #638333 - Critical warning when invoking File->New->Mail Folder | Milan Crha | 2011-02-16 | 4 | -9/+17 |
| | |||||
* | Bug #640802 - [express] Message preview automatically switches to vertical view | Milan Crha | 2011-02-16 | 1 | -1/+1 |
| | |||||
* | Slightly nicer EAlertDialog after move to gtk3 | Milan Crha | 2011-02-16 | 1 | -2/+1 |
| | |||||
* | Fix few memory leaks | Milan Crha | 2011-02-15 | 3 | -5/+31 |
| | |||||
* | Bug 642171 - Implicit libgnome dependency for lockdown GConf keys | Matthew Barnes | 2011-02-13 | 1 | -0/+5 |
| | | | | | Lockdown keys have moved to gsettings-desktop-schemas, so disable lockdown integration until we're ready for GSettings. | ||||
* | Remove NULL checks for GObject methods. | Matthew Barnes | 2011-02-13 | 8 | -18/+16 |
| | | | | | As of GLib 2.28 all GObject virtual methods, including constructed(), are safe to chain up to unconditionally. Remove unnecessary checks. |