[geary: 2/10] Merge remote-tracking branch 'origin/mainline' into wip/90-304-image-dnd-paste
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary: 2/10] Merge remote-tracking branch 'origin/mainline' into wip/90-304-image-dnd-paste
- Date: Sun, 17 Nov 2019 05:52:09 +0000 (UTC)
commit 8ddd0b6d8dc6a0b63c1e362b46750bbea1f721c5
Merge: b4e3f196 3e7a9dac
Author: Chris Heywood <15127-creywood users noreply gitlab gnome org>
Date: Fri Oct 25 12:01:26 2019 +0200
Merge remote-tracking branch 'origin/mainline' into wip/90-304-image-dnd-paste
.gitignore | 1 +
.gitlab-ci.yml | 92 +-
COPYING.pyyaml | 20 +
INSTALL | 27 +-
NEWS | 34 +
THANKS | 3 +
build-aux/yaml/__init__.py | 402 ++
build-aux/yaml/composer.py | 139 +
build-aux/yaml/constructor.py | 720 ++++
build-aux/yaml/cyaml.py | 101 +
build-aux/yaml/dumper.py | 62 +
build-aux/yaml/emitter.py | 1137 ++++++
build-aux/yaml/error.py | 75 +
build-aux/yaml/events.py | 86 +
build-aux/yaml/loader.py | 63 +
build-aux/yaml/nodes.py | 49 +
build-aux/yaml/parser.py | 589 +++
build-aux/yaml/reader.py | 185 +
build-aux/yaml/representer.py | 389 ++
build-aux/yaml/resolver.py | 227 ++
build-aux/yaml/scanner.py | 1435 ++++++++
build-aux/yaml/serializer.py | 111 +
build-aux/yaml/tokens.py | 104 +
build-aux/yaml_to_json.py | 25 +
desktop/meson.build | 14 +-
desktop/org.gnome.Geary.appdata.xml.in.in | 14 +-
desktop/org.gnome.Geary.gschema.xml | 12 -
help/C/preferences.page | 94 +-
help/cs/cs.po | 71 +-
help/pl/pl.po | 67 +-
icons/meson.build | 7 +-
meson.build | 116 +-
meson_options.txt | 61 +-
org.gnome.Geary.json | 146 +-
org.gnome.Geary.yml | 210 ++
po/POTFILES.in | 19 +-
po/ca.po | 6 +-
po/cs.po | 269 +-
po/eu.po | 3895 ++++++++++++++------
po/ja.po | 68 +-
sql/meson.build | 2 +-
src/client/accounts/accounts-editor-add-pane.vala | 2 +-
src/client/accounts/accounts-editor-list-pane.vala | 6 +-
.../accounts/accounts-editor-servers-pane.vala | 2 +-
src/client/accounts/accounts-editor.vala | 4 +-
src/client/application/application-contact.vala | 34 +-
src/client/application/application-controller.vala | 125 +-
.../application-notification-context.vala} | 216 +-
.../application/application-plugin-manager.vala | 67 +
src/client/application/geary-application.vala | 43 +
src/client/application/geary-config.vala | 10 -
src/client/components/client-web-view.vala | 1 +
.../components-in-app-notification.vala} | 4 +-
src/client/components/main-window.vala | 2 +-
src/client/composer/composer-web-view.vala | 13 +-
src/client/composer/composer-widget.vala | 40 +-
.../conversation-list/conversation-list-view.vala | 4 +-
.../conversation-viewer/conversation-message.vala | 11 +-
src/client/dialogs/preferences-dialog.vala | 9 -
src/client/folder-list/folder-list-tree.vala | 4 +-
src/client/meson.build | 32 +-
src/client/notification/libmessagingmenu.vala | 94 -
.../notification/new-messages-indicator.vala | 48 -
src/client/notification/null-indicator.vala | 16 -
src/client/notification/unity-launcher.vala | 59 -
.../desktop-notifications.plugin.in | 5 +
.../desktop-notifications.vala} | 172 +-
.../plugin/desktop-notifications/meson.build | 26 +
src/client/plugin/meson.build | 27 +
src/client/plugin/messaging-menu/meson.build | 46 +
.../plugin/messaging-menu/messaging-menu.plugin.in | 5 +
.../plugin/messaging-menu/messaging-menu.vala | 106 +
src/client/plugin/notification-badge/meson.build | 31 +
.../notification-badge.plugin.in | 5 +
.../notification-badge/notification-badge.vala | 55 +
src/client/plugin/plugin-notification.vala | 29 +
src/client/util/util-international.vala | 13 +-
src/client/util/util-migrate.vala | 8 +-
src/client/web-process/web-process-extension.vala | 4 +-
src/console/meson.build | 4 +-
src/engine/api/geary-contact.vala | 10 +-
src/engine/api/geary-folder-supports-create.vala | 7 +-
src/engine/api/geary-logging.vala | 70 +-
src/engine/app/app-draft-manager.vala | 81 +-
src/engine/common/common-contact-harvester.vala | 76 +-
src/engine/common/common-contact-store-impl.vala | 31 +-
.../gmail/imap-engine-gmail-drafts-folder.vala | 37 +-
.../gmail/imap-engine-gmail-folder.vala | 13 +-
.../imap-engine/imap-engine-generic-folder.vala | 13 +-
.../imap-engine/imap-engine-minimal-folder.vala | 54 +-
src/engine/meson.build | 12 +-
src/engine/outbox/outbox-folder.vala | 1 -
src/engine/rfc822/rfc822-message.vala | 8 +-
src/engine/rfc822/rfc822-utils.vala | 5 +-
src/engine/smtp/smtp-client-service.vala | 4 +-
src/mailer/meson.build | 4 +-
src/meson.build | 59 +-
.../common/common-contact-harvester-test.vala | 20 +-
.../common/common-contact-store-impl-test.vala | 18 +-
test/engine/imap-db/imap-db-database-test.vala | 16 +-
test/js/composer-page-state-test.vala | 137 +-
test/meson.build | 20 +-
test/test-client.vala | 7 +-
test/test-engine.vala | 15 +-
...cation.ui => components-in-app-notification.ui} | 2 +-
ui/components-inspector-log-view.ui | 4 +-
ui/composer-web-view.css | 6 +-
ui/composer-web-view.js | 158 +-
ui/conversation-web-view.css | 3 +
ui/org.gnome.Geary.gresource.xml | 2 +-
ui/preferences-dialog.ui | 111 +-
111 files changed, 10681 insertions(+), 2852 deletions(-)
---
diff --cc src/client/composer/composer-widget.vala
index bc867b54,8585cfa0..d48e4ac7
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@@ -161,14 -161,18 +161,20 @@@ public class ComposerWidget : Gtk.Event
private const string URI_LIST_MIME_TYPE = "text/uri-list";
private const string FILE_URI_PREFIX = "file://";
+ // Keep these in sync with the next const below.
+ private const string ATTACHMENT_KEYWORDS =
+
"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|enclosing|encloses|enclosure|enclosures";
// Translators: This is list of keywords, separated by pipe ("|")
// characters, that suggest an attachment; since this is full-word
- // checking, include all variants of each word. No spaces are
- // allowed.
- private const string ATTACHMENT_KEYWORDS_LOCALIZED =
_("attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|enclosing|encloses|enclosure|enclosures");
+ // checking, include all variants of each word. No spaces are
+ // allowed. The words will be converted to lower case based on
+ // locale and English versions included automatically.
+ private const string ATTACHMENT_KEYWORDS_LOCALISED =
+
_("attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|enclosing|encloses|enclosure|enclosures");
+
+ private const string PASTED_IMAGE_FILENAME_TEMPLATE = "geary-pasted-image-%u.png";
+
public Geary.Account account { get; private set; }
private Gee.Map<string, Geary.AccountInformation> accounts;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]