[geary/gtk-3.10: 115/115] Merge branch 'master' into gtk-3.10
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/gtk-3.10: 115/115] Merge branch 'master' into gtk-3.10
- Date: Fri, 4 Apr 2014 20:29:59 +0000 (UTC)
commit 45a9a55444fc1c56538f94b11cf660ec32e71e0b
Merge: 3b8074a 730b33d
Author: Jim Nelson <jim yorba org>
Date: Fri Apr 4 13:29:40 2014 -0700
Merge branch 'master' into gtk-3.10
Conflicts:
src/client/components/main-window.vala
src/client/components/pill-toolbar.vala
src/engine/abstract/geary-abstract-folder.vala
.gitignore | 2 +
CMakeLists.txt | 9 +-
INSTALL | 22 +-
NEWS | 32 +
README | 2 +-
THANKS | 4 +
bindings/vapi/gmime-2.6/gmime-2.6-custom.vala | 2 +-
cmake/FindDesktopFileValidate.cmake | 2 +-
cmake/FindIntltool.cmake | 2 +-
configure | 8 +-
debian/changelog | 10 +
debian/control | 3 +-
debian/copyright | 2 +-
desktop/geary.appdata.xml | 2 +-
help/C/accounts.page | 22 +-
help/C/archive.page | 12 +-
help/C/bugs.page | 13 +-
help/C/limits.page | 2 +-
help/C/overview.page | 4 +-
help/C/preferences.page | 6 +-
help/C/search.page | 40 +-
help/C/shortcuts.page | 3 +-
help/CMakeLists.txt | 94 +-
help/Makefile.am | 2 +-
help/el/el.po | 914 +++++++
help/es/es.po | 447 +++--
help/it/it.po | 1083 ++++++++
icons/CMakeLists.txt | 4 -
icons/read-symbolic.svg | 66 -
icons/star-symbolic.svg | 46 -
icons/unread-symbolic.svg | 71 -
icons/unstarred-symbolic.svg | 46 -
po/LINGUAS | 1 +
po/POTFILES.in | 8 +-
po/cs.po | 505 +++--
po/de.po | 2651 +++++++++++---------
po/es.po | 467 ++--
po/fi.po | 2609 +++++++++++---------
po/fr.po | 635 +++--
po/gl.po | 316 ++--
po/he.po | 443 ++--
po/id.po | 2572 ++++++++++---------
po/it.po | 2611 +++++++++++---------
po/lt.po | 2615 +++++++++++---------
po/pl.po | 434 ++--
po/pt_BR.po | 650 +++--
po/sl.po | 2676 +++++++++++---------
po/sr.po | 2625 +++++++++++---------
po/sr latin po | 1829 +++++++++++++
po/sv.po | 2593 +++++++++++---------
po/uk.po | 2604 +++++++++++---------
po/zh_CN.po | 2576 +++++++++++---------
sql/CMakeLists.txt | 4 +
sql/version-018.sql | 4 +
sql/version-019.sql | 5 +
sql/version-020.sql | 7 +
sql/version-021.sql | 13 +
src/CMakeLists.txt | 9 +-
.../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 | 71 +-
src/client/accounts/login-dialog.vala | 2 +-
src/client/application/geary-action-adapter.vala | 2 +-
src/client/application/geary-application.vala | 6 +-
src/client/application/geary-args.vala | 2 +-
src/client/application/geary-config.vala | 2 +-
src/client/application/geary-controller.vala | 139 +-
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 | 23 +-
src/client/components/main-toolbar.vala | 2 +-
src/client/components/main-window.vala | 56 +-
src/client/components/monitored-progress-bar.vala | 2 +-
src/client/components/monitored-spinner.vala | 2 +-
src/client/components/pill-toolbar.vala | 3 +-
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 | 119 +-
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 | 11 +-
.../conversation-list/conversation-list-view.vala | 8 +-
.../formatted-conversation-data.vala | 46 +-
.../conversation-viewer/conversation-viewer.vala | 53 +-
.../conversation-viewer/conversation-web-view.vala | 11 +-
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 | 4 +-
.../folder-list/folder-list-account-branch.vala | 14 +-
.../folder-list/folder-list-folder-entry.vala | 24 +-
.../folder-list-inbox-folder-entry.vala | 2 +-
.../folder-list/folder-list-inboxes-branch.vala | 2 +-
.../folder-list/folder-list-search-branch.vala | 6 +-
.../folder-list/folder-list-special-grouping.vala | 8 +-
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 | 22 +-
.../sidebar/sidebar-count-cell-renderer.vala | 2 +-
src/client/sidebar/sidebar-entry.vala | 12 +-
src/client/sidebar/sidebar-tree.vala | 108 +-
src/client/util/util-date.vala | 5 +-
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 | 47 +-
src/console/main.vala | 2 +-
src/engine/abstract/geary-abstract-account.vala | 5 +-
src/engine/abstract/geary-abstract-folder.vala | 4 +-
.../abstract/geary-abstract-local-folder.vala | 6 +-
src/engine/api/geary-account-information.vala | 119 +-
src/engine/api/geary-account.vala | 11 +-
.../api/geary-aggregated-folder-properties.vala | 4 +-
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 | 17 +-
src/engine/api/geary-engine-error.vala | 2 +-
src/engine/api/geary-engine.vala | 2 +-
src/engine/api/geary-folder-path.vala | 58 +-
src/engine/api/geary-folder-properties.vala | 13 +-
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 | 4 +-
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 | 6 +-
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 | 8 +-
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 | 5 +-
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 | 20 +-
src/engine/db/db.vala | 2 +-
src/engine/imap-db/imap-db-account.vala | 49 +-
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 | 42 +-
src/engine/imap-db/imap-db-email-identifier.vala | 2 +-
src/engine/imap-db/imap-db-folder.vala | 236 ++-
src/engine/imap-db/imap-db-message-addresses.vala | 5 +-
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 | 4 +-
.../imap-db/outbox/smtp-outbox-folder-root.vala | 2 +-
src/engine/imap-db/outbox/smtp-outbox-folder.vala | 14 +-
.../gmail/imap-engine-gmail-account.vala | 63 +-
.../gmail/imap-engine-gmail-folder.vala | 11 +-
.../gmail/imap-engine-gmail-search-folder.vala | 4 +-
.../imap-engine-account-synchronizer.vala | 116 +-
.../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 | 8 +-
.../imap-engine/imap-engine-generic-account.vala | 301 ++-
.../imap-engine-generic-all-mail-folder.vala | 18 -
.../imap-engine-generic-drafts-folder.vala | 28 -
.../imap-engine/imap-engine-generic-folder.vala | 1289 +----------
.../imap-engine-generic-sent-mail-folder.vala | 22 -
.../imap-engine-generic-trash-folder.vala | 23 -
.../imap-engine/imap-engine-minimal-folder.vala | 1382 ++++++++++
.../imap-engine/imap-engine-replay-operation.vala | 2 +-
.../imap-engine/imap-engine-replay-queue.vala | 8 +-
.../imap-engine-send-replay-operation.vala | 2 +-
src/engine/imap-engine/imap-engine.vala | 2 +-
.../other/imap-engine-other-account.vala | 21 +-
.../other/imap-engine-other-folder.vala | 9 +-
.../outlook/imap-engine-outlook-account.vala | 25 +-
.../outlook/imap-engine-outlook-drafts-folder.vala | 19 +
.../outlook/imap-engine-outlook-folder.vala | 9 +-
.../imap-engine-abstract-list-email.vala | 10 +-
.../replay-ops/imap-engine-copy-email.vala | 6 +-
.../replay-ops/imap-engine-create-email.vala | 6 +-
.../replay-ops/imap-engine-fetch-email.vala | 6 +-
.../replay-ops/imap-engine-list-email-by-id.vala | 4 +-
.../imap-engine-list-email-by-sparse-id.vala | 4 +-
.../replay-ops/imap-engine-mark-email.vala | 6 +-
.../replay-ops/imap-engine-move-email.vala | 6 +-
.../replay-ops/imap-engine-remove-email.vala | 8 +-
.../replay-ops/imap-engine-replay-append.vala | 6 +-
.../replay-ops/imap-engine-replay-disconnect.vala | 6 +-
.../replay-ops/imap-engine-replay-removal.vala | 17 +-
.../imap-engine-server-search-email.vala | 4 +-
.../yahoo/imap-engine-yahoo-account.vala | 23 +-
.../yahoo/imap-engine-yahoo-folder.vala | 9 +-
src/engine/imap/api/imap-account.vala | 55 +-
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 | 12 +-
src/engine/imap/api/imap-folder-root.vala | 2 +-
src/engine/imap/api/imap-folder.vala | 4 +-
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-create-command.vala | 23 +
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 | 2 +-
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 | 9 +-
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 | 2 +-
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 | 2 +-
.../imap/response/imap-continuation-response.vala | 2 +-
.../imap/response/imap-fetch-data-decoder.vala | 2 +-
.../imap/response/imap-mailbox-attribute.vala | 8 +-
.../imap/response/imap-mailbox-attributes.vala | 13 +-
.../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 | 12 +-
.../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 | 17 +-
src/engine/rfc822/rfc822-utils.vala | 15 +-
src/engine/rfc822/rfc822.vala | 12 +-
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 | 5 +-
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 | 9 +-
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 | 7 +-
src/engine/util/util-imap-utf7.vala | 2 +-
src/engine/util/util-inet.vala | 2 +-
src/engine/util/util-iterable.vala | 9 +-
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 | 4 +-
src/engine/util/util-trillian.vala | 2 +-
src/mailer/main.vala | 2 +-
theming/message-viewer.css | 52 +-
ui/accelerators.ui | 2 +
ui/composer.glade | 18 +-
ui/login.glade | 39 +-
ui/remove_confirm.glade | 2 +-
407 files changed, 24175 insertions(+), 16021 deletions(-)
---
diff --cc src/client/components/main-window.vala
index 0d617de,b42162b..ec5159f
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@@ -30,7 -30,7 +30,8 @@@ public class MainWindow : Gtk.Applicati
private MonitoredSpinner spinner = new MonitoredSpinner();
private Geary.AggregateProgressMonitor progress_monitor = new Geary.AggregateProgressMonitor();
private Geary.ProgressMonitor? conversation_monitor_progress = null;
+ private Geary.Folder? current_folder = null;
+ private Geary.ProgressMonitor? folder_progress = null;
public MainWindow(GearyApplication application) {
Object(application: application);
@@@ -223,42 -255,5 +243,50 @@@
debug("Could not access account progress monitors: %s", e.message);
}
}
+
+ private void on_folder_selected(Geary.Folder? folder) {
++ if (folder_progress != null) {
++ progress_monitor.remove(folder_progress);
++ folder_progress = null;
++ }
++
+ // disconnect from old folder
+ if (current_folder != null) {
+ current_folder.properties.notify.disconnect(update_headerbar);
+ current_folder.display_name_changed.disconnect(update_headerbar);
+ }
+
+ // connect to new folder
+ if (folder != null) {
++ folder_progress = folder.opening_monitor;
++ progress_monitor.add(folder_progress);
++
+ folder.properties.notify.connect(update_headerbar);
+ folder.display_name_changed.connect(update_headerbar);
+ }
+
+ // swap it in
+ current_folder = folder;
+
+ update_headerbar();
+ }
+
+ private void update_headerbar() {
+ if (current_folder == null) {
+ main_toolbar.title = null;
+ main_toolbar.subtitle = null;
+
+ return;
+ }
+
+ main_toolbar.title = current_folder.account.information.nickname;
+ if(current_folder.properties.email_unread > 0) {
+ /// Current folder's name followed by its unread count, i.e. "Inbox (42)"
+ main_toolbar.subtitle = _("%s (%d)").printf(current_folder.get_display_name(),
+ current_folder.properties.email_unread);
+ } else {
+ main_toolbar.subtitle = current_folder.get_display_name();
+ }
+ }
}
diff --cc src/engine/abstract/geary-abstract-folder.vala
index 5f8890e,9ff96b3..1da1cd0
--- a/src/engine/abstract/geary-abstract-folder.vala
+++ b/src/engine/abstract/geary-abstract-folder.vala
@@@ -5,14 -5,8 +5,16 @@@
*/
public abstract class Geary.AbstractFolder : BaseObject, Geary.Folder {
+ public abstract Geary.Account account { get; }
+
+ public abstract Geary.FolderProperties properties { get; }
+
+ public abstract Geary.FolderPath path { get; }
+
+ public abstract Geary.SpecialFolderType special_folder_type { get; }
+
+ public Geary.ProgressMonitor opening_monitor { get; protected set; }
+
/*
* notify_* methods for AbstractFolder are marked internal because the SendReplayOperations
* need access to them to report changes as they occur.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
