[geary: 13/13] Merge branch 'wip/181-special-folder-dupes' into 'master'



commit 5152581a0cd461405258f624783d0b3d884d3b14
Merge: ccee4259 bb0060b5
Author: Michael Gratton <mike vee net>
Date:   Mon Jan 14 14:08:49 2019 +0000

    Merge branch 'wip/181-special-folder-dupes' into 'master'
    
    Fix special folder duplicates
    
    Closes #181
    
    See merge request GNOME/geary!82

 po/POTFILES.in                                     |   2 -
 src/client/accounts/accounts-manager.vala          |  53 ++-
 .../folder-list/folder-list-account-branch.vala    |   6 +-
 src/engine/api/geary-account-information.vala      |  12 +-
 src/engine/api/geary-folder-path.vala              | 463 ++++++++++-----------
 src/engine/api/geary-folder.vala                   |   6 +-
 src/engine/imap-db/imap-db-account.vala            | 236 ++++++-----
 .../imap-db/search/imap-db-search-folder-root.vala |  14 -
 .../imap-db/search/imap-db-search-folder.vala      |  25 +-
 .../gmail/imap-engine-gmail-account.vala           |  36 +-
 .../gmail/imap-engine-gmail-search-folder.vala     |   4 +-
 .../imap-engine-account-synchronizer.vala          |   1 -
 .../imap-engine/imap-engine-generic-account.vala   | 234 +++++++----
 .../imap-engine/imap-engine-minimal-folder.vala    |  18 +-
 .../imap-engine/imap-engine-replay-queue.vala      |   8 +-
 src/engine/imap-engine/imap-engine.vala            |  79 ++--
 .../other/imap-engine-other-account.vala           |  14 +-
 .../outlook/imap-engine-outlook-account.vala       |  35 +-
 .../yahoo/imap-engine-yahoo-account.vala           |  27 +-
 src/engine/imap/api/imap-account-session.vala      |  53 ++-
 src/engine/imap/api/imap-folder-root.vala          |  71 ++--
 .../imap/message/imap-mailbox-specifier.vala       |  96 +++--
 .../imap/response/imap-mailbox-information.vala    |  13 +-
 src/engine/imap/transport/imap-client-session.vala |  33 +-
 src/engine/meson.build                             |   2 -
 src/engine/outbox/outbox-folder-root.vala          |  18 -
 src/engine/outbox/outbox-folder.vala               |  22 +-
 test/engine/api/geary-folder-path-mock.vala        |  14 -
 test/engine/api/geary-folder-path-test.vala        | 249 +++++++++++
 test/engine/app/app-conversation-monitor-test.vala |  14 +-
 test/engine/app/app-conversation-set-test.vala     |  20 +-
 test/engine/app/app-conversation-test.vala         |  21 +-
 test/engine/imap-db/imap-db-account-test.vala      | 309 ++++++++++++++
 .../imap/message/imap-mailbox-specifier-test.vala  |  85 ++--
 test/meson.build                                   |   3 +-
 test/test-case.vala                                |  23 +
 test/test-engine.vala                              |   2 +
 37 files changed, 1577 insertions(+), 744 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]