[geary: 3/3] Merge branch 'mjog/revert-webkit-shared-process' into 'mainline'



commit 1c098b9b4ac7174ae2f45e5e66a9bb80c096d558
Merge: bfdecebd 3340d791
Author: Michael Gratton <mike vee net>
Date:   Sat Feb 15 22:47:06 2020 +0000

    Merge branch 'mjog/revert-webkit-shared-process' into 'mainline'
    
    Revert "Merge branch 'mjog/558-webkit-shared-process' into 'mainline'"
    
    See merge request GNOME/geary!411

 desktop/org.gnome.Geary.appdata.xml.in.in          |   1 -
 po/POTFILES.in                                     |   2 +-
 src/client/accounts/accounts-editor-edit-pane.vala |   4 +-
 .../accounts/accounts-signature-web-view.vala      |   4 +-
 src/client/application/application-controller.vala |   5 +-
 src/client/application/main.vala                   |   6 +
 ...mponents-web-view.vala => client-web-view.vala} | 156 ++++++++--------
 src/client/composer/composer-web-view.vala         |   6 +-
 src/client/composer/composer-widget.vala           |   9 +-
 .../conversation-viewer/conversation-email.vala    |  26 +--
 .../conversation-viewer/conversation-list-box.vala |  14 +-
 .../conversation-viewer/conversation-message.vala  | 207 ++++-----------------
 .../conversation-viewer/conversation-viewer.vala   |  24 +--
 .../conversation-viewer/conversation-web-view.vala |  41 +---
 src/client/meson.build                             |  12 +-
 src/client/web-process/web-process-extension.vala  |  43 ++---
 ...st-case.vala => client-web-view-test-case.vala} |  23 +--
 ...eb-view-test.vala => client-web-view-test.vala} |  10 +-
 test/client/composer/composer-web-view-test.vala   |   2 +-
 ...state-test.vala => client-page-state-test.vala} |  16 +-
 test/js/composer-page-state-test.vala              |   2 +-
 test/js/conversation-page-state-test.vala          |   2 +-
 test/meson.build                                   |   6 +-
 test/test-client.vala                              |   6 +-
 ui/client-web-view-allow-remote-images.js          |  11 ++
 ui/{components-web-view.js => client-web-view.js}  |   5 +-
 ui/conversation-message.ui                         |   1 -
 ui/org.gnome.Geary.gresource.xml                   |   3 +-
 28 files changed, 240 insertions(+), 407 deletions(-)
---


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