[geary/wip/create-folders-713492: 25/26] Merge branch 'master' into create-folders
- From: Charles Lindsay <clindsay src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/create-folders-713492: 25/26] Merge branch 'master' into create-folders
- Date: Fri, 7 Feb 2014 03:01:09 +0000 (UTC)
commit 431b76fe113e89ef4026c7cefc9ac220f49f0750
Merge: 2b765f9 a88e443
Author: Charles Lindsay <chaz yorba org>
Date: Thu Feb 6 18:38:42 2014 -0800
Merge branch 'master' into create-folders
Conflicts:
po/POTFILES.in
src/CMakeLists.txt
src/engine/imap-engine/imap-engine-generic-all-mail-folder.vala
src/engine/imap-engine/imap-engine-generic-drafts-folder.vala
src/engine/imap-engine/imap-engine-generic-folder.vala
src/engine/imap-engine/imap-engine-generic-sent-mail-folder.vala
src/engine/imap-engine/imap-engine-generic-trash-folder.vala
src/engine/imap-engine/replay-ops/imap-engine-replay-append.vala
src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala
src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
CMakeLists.txt | 2 +-
INSTALL | 2 +-
README | 2 +-
bindings/vapi/gmime-2.6/gmime-2.6-custom.vala | 2 +-
cmake/FindDesktopFileValidate.cmake | 2 +-
cmake/FindIntltool.cmake | 2 +-
configure | 2 +-
debian/copyright | 2 +-
desktop/geary.appdata.xml | 2 +-
po/LINGUAS | 1 +
po/POTFILES.in | 2 +-
po/es.po | 417 ++--
po/gl.po | 316 ++--
po/pl.po | 332 ++--
po/sr.po | 2534 +++++++++++---------
po/sr latin po | 1736 ++++++++++++++
src/CMakeLists.txt | 4 +-
.../accounts/account-dialog-account-list-pane.vala | 2 +-
.../accounts/account-dialog-add-edit-pane.vala | 2 +-
src/client/accounts/account-dialog-pane.vala | 2 +-
.../account-dialog-remove-confirm-pane.vala | 2 +-
.../accounts/account-dialog-remove-fail-pane.vala | 2 +-
.../accounts/account-dialog-spinner-pane.vala | 2 +-
src/client/accounts/account-dialog.vala | 2 +-
src/client/accounts/account-spinner-page.vala | 2 +-
src/client/accounts/add-edit-page.vala | 2 +-
src/client/accounts/login-dialog.vala | 2 +-
src/client/application/geary-action-adapter.vala | 2 +-
src/client/application/geary-application.vala | 4 +-
src/client/application/geary-args.vala | 2 +-
src/client/application/geary-config.vala | 2 +-
src/client/application/geary-controller.vala | 4 +-
src/client/application/main.vala | 2 +-
src/client/application/secret-mediator.vala | 2 +-
src/client/components/conversation-find-bar.vala | 2 +-
src/client/components/count-badge.vala | 2 +-
src/client/components/folder-menu.vala | 2 +-
src/client/components/icon-factory.vala | 2 +-
src/client/components/main-toolbar.vala | 2 +-
src/client/components/main-window.vala | 2 +-
src/client/components/monitored-progress-bar.vala | 2 +-
src/client/components/monitored-spinner.vala | 2 +-
src/client/components/pill-toolbar.vala | 10 +-
src/client/components/status-bar.vala | 2 +-
src/client/components/stock.vala | 2 +-
src/client/composer/composer-toolbar.vala | 2 +-
src/client/composer/composer-window.vala | 2 +-
src/client/composer/contact-entry-completion.vala | 2 +-
src/client/composer/contact-list-store.vala | 2 +-
src/client/composer/email-entry.vala | 2 +-
src/client/composer/webview-edit-fixer.vala | 2 +-
.../conversation-list-cell-renderer.vala | 2 +-
.../conversation-list/conversation-list-store.vala | 2 +-
.../conversation-list/conversation-list-view.vala | 2 +-
.../formatted-conversation-data.vala | 2 +-
.../conversation-viewer/conversation-viewer.vala | 2 +-
.../conversation-viewer/conversation-web-view.vala | 2 +-
src/client/dialogs/alert-dialog.vala | 2 +-
src/client/dialogs/attachment-dialog.vala | 2 +-
src/client/dialogs/password-dialog.vala | 2 +-
src/client/dialogs/preferences-dialog.vala | 2 +-
src/client/dialogs/upgrade-dialog.vala | 2 +-
.../folder-list-abstract-folder-entry.vala | 2 +-
.../folder-list/folder-list-account-branch.vala | 2 +-
.../folder-list/folder-list-folder-entry.vala | 2 +-
.../folder-list-inbox-folder-entry.vala | 2 +-
.../folder-list/folder-list-inboxes-branch.vala | 2 +-
.../folder-list/folder-list-search-branch.vala | 2 +-
.../folder-list/folder-list-special-grouping.vala | 2 +-
src/client/folder-list/folder-list-tree.vala | 2 +-
src/client/notification/libmessagingmenu.vala | 2 +-
src/client/notification/libnotify.vala | 2 +-
.../notification/new-messages-indicator.vala | 2 +-
src/client/notification/new-messages-monitor.vala | 2 +-
src/client/notification/null-indicator.vala | 2 +-
src/client/notification/unity-launcher.vala | 2 +-
src/client/sidebar/sidebar-branch.vala | 2 +-
src/client/sidebar/sidebar-common.vala | 2 +-
.../sidebar/sidebar-count-cell-renderer.vala | 2 +-
src/client/sidebar/sidebar-entry.vala | 2 +-
src/client/sidebar/sidebar-tree.vala | 2 +-
src/client/util/util-date.vala | 2 +-
src/client/util/util-email.vala | 2 +-
src/client/util/util-files.vala | 2 +-
src/client/util/util-gravatar.vala | 2 +-
src/client/util/util-gtk.vala | 2 +-
src/client/util/util-international.vala | 2 +-
src/client/util/util-webkit.vala | 10 +-
src/console/main.vala | 4 +-
src/engine/abstract/geary-abstract-account.vala | 2 +-
src/engine/abstract/geary-abstract-folder.vala | 2 +-
.../abstract/geary-abstract-local-folder.vala | 2 +-
src/engine/api/geary-account-information.vala | 2 +-
src/engine/api/geary-account.vala | 2 +-
.../api/geary-aggregated-folder-properties.vala | 2 +-
src/engine/api/geary-attachment.vala | 2 +-
src/engine/api/geary-base-object.vala | 2 +-
src/engine/api/geary-composed-email.vala | 2 +-
src/engine/api/geary-contact-flags.vala | 2 +-
src/engine/api/geary-contact-importance.vala | 2 +-
src/engine/api/geary-contact-store.vala | 2 +-
src/engine/api/geary-contact.vala | 2 +-
src/engine/api/geary-credentials-mediator.vala | 2 +-
src/engine/api/geary-credentials.vala | 2 +-
src/engine/api/geary-email-flags.vala | 2 +-
src/engine/api/geary-email-identifier.vala | 2 +-
src/engine/api/geary-email-properties.vala | 2 +-
src/engine/api/geary-email.vala | 2 +-
src/engine/api/geary-endpoint.vala | 2 +-
src/engine/api/geary-engine-error.vala | 2 +-
src/engine/api/geary-engine.vala | 2 +-
src/engine/api/geary-folder-path.vala | 2 +-
src/engine/api/geary-folder-properties.vala | 2 +-
src/engine/api/geary-folder-supports-archive.vala | 2 +-
src/engine/api/geary-folder-supports-copy.vala | 2 +-
src/engine/api/geary-folder-supports-create.vala | 2 +-
src/engine/api/geary-folder-supports-mark.vala | 2 +-
src/engine/api/geary-folder-supports-move.vala | 2 +-
src/engine/api/geary-folder-supports-remove.vala | 2 +-
src/engine/api/geary-folder.vala | 2 +-
src/engine/api/geary-logging.vala | 2 +-
src/engine/api/geary-named-flag.vala | 2 +-
src/engine/api/geary-named-flags.vala | 2 +-
src/engine/api/geary-progress-monitor.vala | 2 +-
src/engine/api/geary-search-folder.vala | 2 +-
src/engine/api/geary-search-query.vala | 2 +-
src/engine/api/geary-service-provider.vala | 2 +-
src/engine/api/geary-special-folder-type.vala | 2 +-
src/engine/app/app-conversation-monitor.vala | 2 +-
src/engine/app/app-conversation.vala | 2 +-
src/engine/app/app-email-store.vala | 2 +-
.../conversation-monitor/app-append-operation.vala | 2 +-
.../app-conversation-operation-queue.vala | 2 +-
.../app-conversation-operation.vala | 2 +-
.../conversation-monitor/app-conversation-set.vala | 2 +-
.../app-external-append-operation.vala | 2 +-
.../app-fill-window-operation.vala | 2 +-
.../app-local-load-operation.vala | 2 +-
.../app-local-search-operation.vala | 2 +-
.../conversation-monitor/app-remove-operation.vala | 2 +-
.../conversation-monitor/app-reseed-operation.vala | 2 +-
.../app-terminate-operation.vala | 2 +-
.../email-store/app-async-folder-operation.vala | 2 +-
src/engine/app/email-store/app-copy-operation.vala | 2 +-
.../app/email-store/app-fetch-operation.vala | 2 +-
src/engine/app/email-store/app-list-operation.vala | 2 +-
src/engine/app/email-store/app-mark-operation.vala | 2 +-
src/engine/common/common-message-data.vala | 2 +-
src/engine/db/db-connection.vala | 2 +-
src/engine/db/db-context.vala | 2 +-
src/engine/db/db-database-error.vala | 2 +-
src/engine/db/db-database.vala | 2 +-
src/engine/db/db-result.vala | 2 +-
src/engine/db/db-statement.vala | 2 +-
src/engine/db/db-synchronous-mode.vala | 2 +-
src/engine/db/db-transaction-async-job.vala | 2 +-
src/engine/db/db-transaction-outcome.vala | 2 +-
src/engine/db/db-transaction-type.vala | 2 +-
src/engine/db/db-versioned-database.vala | 2 +-
src/engine/db/db.vala | 2 +-
src/engine/imap-db/imap-db-account.vala | 2 +-
src/engine/imap-db/imap-db-attachment.vala | 2 +-
src/engine/imap-db/imap-db-contact.vala | 2 +-
src/engine/imap-db/imap-db-database.vala | 2 +-
src/engine/imap-db/imap-db-email-identifier.vala | 2 +-
src/engine/imap-db/imap-db-folder.vala | 2 +-
src/engine/imap-db/imap-db-message-addresses.vala | 2 +-
src/engine/imap-db/imap-db-message-row.vala | 2 +-
.../imap-db/imap-db-search-email-identifier.vala | 2 +-
.../outbox/smtp-outbox-email-identifier.vala | 2 +-
.../outbox/smtp-outbox-email-properties.vala | 2 +-
.../outbox/smtp-outbox-folder-properties.vala | 2 +-
.../imap-db/outbox/smtp-outbox-folder-root.vala | 2 +-
src/engine/imap-db/outbox/smtp-outbox-folder.vala | 2 +-
.../gmail/imap-engine-gmail-account.vala | 2 +-
.../gmail/imap-engine-gmail-folder.vala | 2 +-
.../gmail/imap-engine-gmail-search-folder.vala | 2 +-
.../imap-engine-account-synchronizer.vala | 8 +-
.../imap-engine/imap-engine-batch-operations.vala | 2 +-
.../imap-engine/imap-engine-contact-store.vala | 2 +-
.../imap-engine-email-flag-watcher.vala | 23 +-
.../imap-engine/imap-engine-email-prefetcher.vala | 2 +-
.../imap-engine/imap-engine-generic-account.vala | 2 +-
.../imap-engine/imap-engine-generic-folder.vala | 2 +-
.../imap-engine-receive-replay-operation.vala | 22 -
.../imap-engine/imap-engine-replay-operation.vala | 2 +-
.../imap-engine/imap-engine-replay-queue.vala | 2 +-
.../imap-engine-send-replay-operation.vala | 2 +-
src/engine/imap-engine/imap-engine.vala | 2 +-
.../other/imap-engine-other-account.vala | 2 +-
.../other/imap-engine-other-folder.vala | 2 +-
.../outlook/imap-engine-outlook-account.vala | 2 +-
.../outlook/imap-engine-outlook-folder.vala | 2 +-
.../imap-engine-abstract-list-email.vala | 2 +-
.../replay-ops/imap-engine-copy-email.vala | 2 +-
.../replay-ops/imap-engine-create-email.vala | 2 +-
.../replay-ops/imap-engine-fetch-email.vala | 2 +-
.../replay-ops/imap-engine-list-email-by-id.vala | 2 +-
.../imap-engine-list-email-by-sparse-id.vala | 2 +-
.../replay-ops/imap-engine-mark-email.vala | 2 +-
.../replay-ops/imap-engine-move-email.vala | 2 +-
.../replay-ops/imap-engine-remove-email.vala | 2 +-
.../replay-ops/imap-engine-replay-append.vala | 13 +-
.../replay-ops/imap-engine-replay-disconnect.vala | 15 +-
.../replay-ops/imap-engine-replay-removal.vala | 12 +-
.../imap-engine-server-search-email.vala | 2 +-
.../yahoo/imap-engine-yahoo-account.vala | 2 +-
.../yahoo/imap-engine-yahoo-folder.vala | 2 +-
src/engine/imap/api/imap-account.vala | 13 +-
src/engine/imap/api/imap-email-flags.vala | 2 +-
src/engine/imap/api/imap-email-properties.vala | 2 +-
src/engine/imap/api/imap-folder-properties.vala | 2 +-
src/engine/imap/api/imap-folder-root.vala | 2 +-
src/engine/imap/api/imap-folder.vala | 2 +-
src/engine/imap/command/imap-append-command.vala | 2 +-
.../imap/command/imap-capability-command.vala | 2 +-
src/engine/imap/command/imap-close-command.vala | 2 +-
src/engine/imap/command/imap-command.vala | 2 +-
src/engine/imap/command/imap-compress-command.vala | 2 +-
src/engine/imap/command/imap-copy-command.vala | 2 +-
src/engine/imap/command/imap-examine-command.vala | 2 +-
src/engine/imap/command/imap-expunge-command.vala | 2 +-
src/engine/imap/command/imap-fetch-command.vala | 2 +-
src/engine/imap/command/imap-id-command.vala | 2 +-
src/engine/imap/command/imap-idle-command.vala | 2 +-
src/engine/imap/command/imap-list-command.vala | 17 +-
.../imap/command/imap-list-return-parameter.vala | 36 +
src/engine/imap/command/imap-login-command.vala | 2 +-
src/engine/imap/command/imap-logout-command.vala | 2 +-
src/engine/imap/command/imap-message-set.vala | 2 +-
src/engine/imap/command/imap-noop-command.vala | 2 +-
src/engine/imap/command/imap-search-command.vala | 2 +-
src/engine/imap/command/imap-search-criteria.vala | 2 +-
src/engine/imap/command/imap-search-criterion.vala | 2 +-
src/engine/imap/command/imap-select-command.vala | 2 +-
src/engine/imap/command/imap-starttls-command.vala | 2 +-
src/engine/imap/command/imap-status-command.vala | 2 +-
src/engine/imap/command/imap-store-command.vala | 2 +-
src/engine/imap/imap-error.vala | 2 +-
src/engine/imap/imap.vala | 2 +-
src/engine/imap/message/imap-data-format.vala | 2 +-
src/engine/imap/message/imap-envelope.vala | 2 +-
.../message/imap-fetch-body-data-specifier.vala | 2 +-
.../imap/message/imap-fetch-data-specifier.vala | 2 +-
src/engine/imap/message/imap-flag.vala | 2 +-
src/engine/imap/message/imap-flags.vala | 2 +-
src/engine/imap/message/imap-internal-date.vala | 2 +-
.../imap/message/imap-mailbox-parameter.vala | 2 +-
.../imap/message/imap-mailbox-specifier.vala | 2 +-
src/engine/imap/message/imap-message-data.vala | 2 +-
src/engine/imap/message/imap-message-flag.vala | 2 +-
src/engine/imap/message/imap-message-flags.vala | 2 +-
src/engine/imap/message/imap-sequence-number.vala | 2 +-
src/engine/imap/message/imap-status-data-type.vala | 2 +-
src/engine/imap/message/imap-tag.vala | 4 +-
src/engine/imap/message/imap-uid-validity.vala | 2 +-
src/engine/imap/message/imap-uid.vala | 2 +-
src/engine/imap/parameter/imap-atom-parameter.vala | 2 +-
src/engine/imap/parameter/imap-list-parameter.vala | 2 +-
.../imap/parameter/imap-literal-parameter.vala | 2 +-
src/engine/imap/parameter/imap-nil-parameter.vala | 2 +-
.../imap/parameter/imap-number-parameter.vala | 2 +-
src/engine/imap/parameter/imap-parameter.vala | 2 +-
.../parameter/imap-quoted-string-parameter.vala | 2 +-
.../imap/parameter/imap-root-parameters.vala | 2 +-
.../imap/parameter/imap-string-parameter.vala | 2 +-
.../parameter/imap-unquoted-string-parameter.vala | 2 +-
src/engine/imap/response/imap-capabilities.vala | 12 +-
.../imap/response/imap-continuation-response.vala | 2 +-
.../imap/response/imap-fetch-data-decoder.vala | 2 +-
.../imap/response/imap-mailbox-attribute.vala | 2 +-
.../imap/response/imap-mailbox-attributes.vala | 2 +-
.../imap/response/imap-response-code-type.vala | 2 +-
src/engine/imap/response/imap-response-code.vala | 2 +-
.../imap/response/imap-server-data-type.vala | 2 +-
src/engine/imap/response/imap-server-data.vala | 2 +-
src/engine/imap/response/imap-server-response.vala | 2 +-
src/engine/imap/response/imap-status-data.vala | 2 +-
src/engine/imap/response/imap-status-response.vala | 2 +-
src/engine/imap/response/imap-status.vala | 2 +-
.../imap/transport/imap-client-connection.vala | 43 +-
.../transport/imap-client-session-manager.vala | 2 +-
src/engine/imap/transport/imap-client-session.vala | 2 +-
src/engine/imap/transport/imap-deserializer.vala | 2 +-
src/engine/imap/transport/imap-serializer.vala | 2 +-
src/engine/memory/memory-buffer.vala | 2 +-
src/engine/memory/memory-byte-buffer.vala | 2 +-
src/engine/memory/memory-empty-buffer.vala | 2 +-
src/engine/memory/memory-file-buffer.vala | 2 +-
src/engine/memory/memory-growable-buffer.vala | 2 +-
src/engine/memory/memory-offset-buffer.vala | 2 +-
src/engine/memory/memory-string-buffer.vala | 2 +-
.../memory/memory-unowned-byte-array-buffer.vala | 2 +-
src/engine/memory/memory-unowned-bytes-buffer.vala | 2 +-
.../memory/memory-unowned-string-buffer.vala | 2 +-
src/engine/mime/mime-content-disposition.vala | 2 +-
src/engine/mime/mime-content-parameters.vala | 2 +-
src/engine/mime/mime-content-type.vala | 2 +-
src/engine/mime/mime-data-format.vala | 2 +-
src/engine/mime/mime-disposition-type.vala | 2 +-
src/engine/mime/mime-error.vala | 2 +-
.../nonblocking-abstract-semaphore.vala | 2 +-
src/engine/nonblocking/nonblocking-batch.vala | 2 +-
src/engine/nonblocking/nonblocking-concurrent.vala | 2 +-
.../nonblocking-counting-semaphore.vala | 2 +-
src/engine/nonblocking/nonblocking-error.vala | 2 +-
src/engine/nonblocking/nonblocking-mailbox.vala | 2 +-
src/engine/nonblocking/nonblocking-mutex.vala | 2 +-
.../nonblocking-reporting-semaphore.vala | 2 +-
src/engine/nonblocking/nonblocking-variants.vala | 2 +-
src/engine/rfc822/rfc822-error.vala | 2 +-
.../rfc822/rfc822-gmime-filter-blockquotes.vala | 2 +-
src/engine/rfc822/rfc822-gmime-filter-flowed.vala | 2 +-
src/engine/rfc822/rfc822-gmime-filter-plain.vala | 2 +-
src/engine/rfc822/rfc822-mailbox-address.vala | 2 +-
src/engine/rfc822/rfc822-mailbox-addresses.vala | 2 +-
src/engine/rfc822/rfc822-message-data.vala | 2 +-
src/engine/rfc822/rfc822-message.vala | 2 +-
src/engine/rfc822/rfc822-utils.vala | 2 +-
src/engine/rfc822/rfc822.vala | 2 +-
src/engine/smtp/smtp-abstract-authenticator.vala | 2 +-
src/engine/smtp/smtp-authenticator.vala | 2 +-
src/engine/smtp/smtp-capabilities.vala | 2 +-
src/engine/smtp/smtp-client-connection.vala | 2 +-
src/engine/smtp/smtp-client-session.vala | 2 +-
src/engine/smtp/smtp-command.vala | 2 +-
src/engine/smtp/smtp-data-format.vala | 2 +-
src/engine/smtp/smtp-error.vala | 2 +-
src/engine/smtp/smtp-greeting.vala | 2 +-
src/engine/smtp/smtp-login-authenticator.vala | 2 +-
src/engine/smtp/smtp-plain-authenticator.vala | 2 +-
src/engine/smtp/smtp-request.vala | 2 +-
src/engine/smtp/smtp-response-code.vala | 2 +-
src/engine/smtp/smtp-response-line.vala | 2 +-
src/engine/smtp/smtp-response.vala | 2 +-
src/engine/state/state-machine-descriptor.vala | 2 +-
src/engine/state/state-machine.vala | 2 +-
src/engine/state/state-mapping.vala | 2 +-
src/engine/util/util-collection.vala | 2 +-
src/engine/util/util-converter.vala | 2 +-
src/engine/util/util-files.vala | 2 +-
src/engine/util/util-generic-capabilities.vala | 2 +-
src/engine/util/util-html.vala | 2 +-
src/engine/util/util-imap-utf7.vala | 2 +-
src/engine/util/util-inet.vala | 2 +-
src/engine/util/util-iterable.vala | 2 +-
src/engine/util/util-numeric.vala | 2 +-
src/engine/util/util-object.vala | 2 +-
src/engine/util/util-reference-semantics.vala | 2 +-
src/engine/util/util-scheduler.vala | 2 +-
src/engine/util/util-stream.vala | 2 +-
src/engine/util/util-string.vala | 2 +-
src/engine/util/util-synchronization.vala | 2 +-
src/engine/util/util-time.vala | 2 +-
src/engine/util/util-trillian.vala | 2 +-
src/mailer/main.vala | 2 +-
ui/accelerators.ui | 2 +
357 files changed, 4178 insertions(+), 2078 deletions(-)
---
diff --cc po/POTFILES.in
index aeefcd2,a4ce70c..fac9ac9
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -195,9 -195,11 +196,8 @@@ src/engine/imap-engine/imap-engine-cont
src/engine/imap-engine/imap-engine-email-flag-watcher.vala
src/engine/imap-engine/imap-engine-email-prefetcher.vala
src/engine/imap-engine/imap-engine-generic-account.vala
-src/engine/imap-engine/imap-engine-generic-all-mail-folder.vala
-src/engine/imap-engine/imap-engine-generic-drafts-folder.vala
src/engine/imap-engine/imap-engine-generic-folder.vala
-src/engine/imap-engine/imap-engine-generic-sent-mail-folder.vala
-src/engine/imap-engine/imap-engine-generic-trash-folder.vala
+src/engine/imap-engine/imap-engine-minimal-folder.vala
- src/engine/imap-engine/imap-engine-receive-replay-operation.vala
src/engine/imap-engine/imap-engine-replay-operation.vala
src/engine/imap-engine/imap-engine-replay-queue.vala
src/engine/imap-engine/imap-engine-send-replay-operation.vala
diff --cc src/CMakeLists.txt
index c824205,3eed7a6..0b44ec8
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -182,9 -182,11 +183,8 @@@ engine/imap-engine/imap-engine-contact-
engine/imap-engine/imap-engine-email-flag-watcher.vala
engine/imap-engine/imap-engine-email-prefetcher.vala
engine/imap-engine/imap-engine-generic-account.vala
-engine/imap-engine/imap-engine-generic-all-mail-folder.vala
-engine/imap-engine/imap-engine-generic-drafts-folder.vala
engine/imap-engine/imap-engine-generic-folder.vala
-engine/imap-engine/imap-engine-generic-sent-mail-folder.vala
-engine/imap-engine/imap-engine-generic-trash-folder.vala
+engine/imap-engine/imap-engine-minimal-folder.vala
- engine/imap-engine/imap-engine-receive-replay-operation.vala
engine/imap-engine/imap-engine-replay-operation.vala
engine/imap-engine/imap-engine-replay-queue.vala
engine/imap-engine/imap-engine-send-replay-operation.vala
diff --cc src/engine/imap-engine/replay-ops/imap-engine-replay-append.vala
index eb5f452,874847d..89a6717
--- a/src/engine/imap-engine/replay-ops/imap-engine-replay-append.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-replay-append.vala
@@@ -9,8 -9,8 +9,8 @@@ private class Geary.ImapEngine.ReplayAp
public int remote_count;
public Gee.List<Imap.SequenceNumber> positions;
- public ReplayAppend(GenericFolder owner, int remote_count, Gee.List<Imap.SequenceNumber> positions) {
+ public ReplayAppend(MinimalFolder owner, int remote_count, Gee.List<Imap.SequenceNumber> positions) {
- base ("Append");
+ base ("Append", Scope.REMOTE_ONLY);
this.owner = owner;
this.remote_count = remote_count;
diff --cc src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala
index a06d93f,f4590c0..c206bb6
--- a/src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala
@@@ -4,12 -4,12 +4,12 @@@
* (version 2.1 or later). See the COPYING file in this distribution.
*/
-private class Geary.ImapEngine.ReplayDisconnect : Geary.ImapEngine.ReplayOperation {
- public GenericFolder owner;
+private class Geary.ImapEngine.ReplayDisconnect : Geary.ImapEngine.ReceiveReplayOperation {
+ public MinimalFolder owner;
public Imap.ClientSession.DisconnectReason reason;
- public ReplayDisconnect(GenericFolder owner, Imap.ClientSession.DisconnectReason reason) {
+ public ReplayDisconnect(MinimalFolder owner, Imap.ClientSession.DisconnectReason reason) {
- base ("Disconnect");
+ base ("Disconnect", Scope.LOCAL_ONLY);
this.owner = owner;
this.reason = reason;
diff --cc src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
index 2339778,0690bb5..4db600d
--- a/src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
@@@ -9,8 -9,8 +9,8 @@@ private class Geary.ImapEngine.ReplayRe
public int remote_count;
public Imap.SequenceNumber position;
- public ReplayRemoval(GenericFolder owner, int remote_count, Imap.SequenceNumber position) {
+ public ReplayRemoval(MinimalFolder owner, int remote_count, Imap.SequenceNumber position) {
- base ("Removal");
+ base ("Removal", Scope.LOCAL_ONLY);
this.owner = owner;
this.remote_count = remote_count;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
