commit 19023fbe19f02a75d4d41715fcdd5e912d70c2e8
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Thu May 19 22:13:26 2016 -0500

    Prepare 3.21.2

 NEWS         | 10 ++++++++++
 configure.ac |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

commit a5dd3a84478a8fe791f3dcb87579c4b25d4a1b03
Author: Tiago Santos <tiagofsantos81@sapo.pt>
Date:   Sat May 21 08:41:17 2016 +0000

    Updated Portuguese translation

 po/pt.po | 1229 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 640 insertions(+), 589 deletions(-)

commit 994154ae405183f10f4b08125465a1b5a0e6b7f4
Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date:   Fri May 20 19:43:43 2016 +0500

    Updated Kazakh translation

 po/kk.po | 1290 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 651 insertions(+), 639 deletions(-)

commit cc5dc7519ff5569af878a77319f3b3b34ae2868e
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Wed May 18 00:20:59 2016 +0200

    Updated POTFILES.in

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit 757e295fd2e6a65a357124e51840b9e1b0e66386
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Tue May 17 11:53:37 2016 -0500

    Revert "ephy-shell: Always focus the main window when loading tabs in Wayland"
    
    This reverts commit af6a08f1c4feea2a1e1824c1cb714842764918ae.

 src/ephy-shell.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit af6a08f1c4feea2a1e1824c1cb714842764918ae
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Mon May 16 22:03:51 2016 -0500

    ephy-shell: Always focus the main window when loading tabs in Wayland
    
    Else the window will never get focused, because most apps don't set
    DESKTOP_STARTUP_ID when launching Epiphany and therefore we have no
    plausible time to pass to gtk_window_present_with_time().
    
    Note that gtk_window_present() on its own seems to do nothing.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=766284

 src/ephy-shell.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit 3634aaedc798e5e088634d3d26a1c9697ed6d4c8
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Mon May 16 21:07:06 2016 -0500

    ephy-shell: Improve a comment

 src/ephy-shell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4b34246355d286fd6cf7b2becb78f139deac7782
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Mon May 16 15:05:06 2016 -0500

    Remove dependency on NSS
    
    Let's not keep this dependency around just to support direct upgrades
    from pre-2009 Epiphany straight to GNOME 3.22.

 configure.ac                |  18 ---
 lib/Makefile.am             |   7 -
 lib/ephy-nss-glue.c         | 312 --------------------------------------------
 lib/ephy-nss-glue.h         |  27 ----
 lib/ephy-profile-migrator.c | 310 +++----------------------------------------
 5 files changed, 15 insertions(+), 659 deletions(-)

commit 1480f35cc37a988869783fcb669f791ce69d7dd1
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Mon May 16 14:57:31 2016 -0500

    Drop unused libwnck dependency
    
    Nothing calls ephy_window_is_on_current_workspace anymore. And this
    can't work under Wayland, anyway.

 configure.ac      |  1 -
 src/ephy-shell.c  | 10 ----------
 src/ephy-window.c | 41 -----------------------------------------
 src/ephy-window.h |  2 --
 4 files changed, 54 deletions(-)

commit cd66493455cfbbb585cc051eb38cbfd640751014
Author: Aurimas Černius <aurisc4@gmail.com>
Date:   Fri May 13 23:30:41 2016 +0300

    Updated Lithuanian translation

 po/lt.po | 1218 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 643 insertions(+), 575 deletions(-)

commit 85efc584643d0600f37ad407d5ea85e405c7262e
Author: Cédric Valmary <cvalmary@yahoo.fr>
Date:   Thu May 12 19:32:40 2016 +0000

    Updated Occitan translation

 po/oc.po | 9720 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 6172 insertions(+), 3548 deletions(-)

commit 0283906a4ba772d447bde4a9c5b738a6e027edaa
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Mar 5 13:33:57 2016 -0600

    download: Handle focus stealing prevention properly
    
    Currently, we always pass the start time of the download to
    ephy_embed_shell_launch_handler for focus stealing preventing. This is
    wrong as it causes apps to not be focused when opening files manually.
    For example, I became confused today when I tried to open an image file,
    and it opened in eog, but eog appeared beneath the Epiphany window and
    did not receive focus, so I could not see it.
    
    Instead, use the current time for focus stealing prevention when the
    download action is activated from somewhere external to this file (e.g.
    the downloads popover), and only use the start time when the download
    action is set in advance via ephy_download_set_download_action(), or
    when opening the download automatically without user interaction.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=610586

 embed/ephy-download.c | 54 +++++++++++++++++++++++++++++----------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

commit c33e83c7fc5eb7594021582528b0e869ecb082e4
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Mar 5 13:25:14 2016 -0600

    download: Add an assertion
    
    https://bugzilla.gnome.org/show_bug.cgi?id=610586

 embed/ephy-download.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit d0ad9976396265f166546ff5e4d483002881b3b7
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Mar 5 13:16:33 2016 -0600

    download: Remove EPHY_DOWNLOAD_ACTION_AUTO
    
    Let's always take the same action when auto-opening a file as when
    opening manually, instead of allowing ephy_download_do_download_action()
    to confusingly invoke itself recursively.
    
    At first, I thought it would be good to treat automatic downloads
    differently, and perform MIME type safety checking on them, but not on
    downloads opened manually. But I'm not so sure anymore, since it is easy
    for a server to give the file a deceptive file extension but report an
    accurate MIME type, which could trick the user into opening a harmful
    file (e.g. a script) if we were to stop performing MIME type safety
    checks on manually-opened files. So let's continue to perform that check
    in both cases. But now that EPHY_DOWNLOAD_ACTION_OPEN browses to the
    file if opening fails, there's no need to have special behavior for
    EPHY_DOWNLOAD_ACTION_AUTO anymore. The only difference that currently
    implies is that we check the safety of the MIME type once for the
    server's reported MIME type, fall back to browsing to the file if it's
    unsafe, then sniff the MIME type ourselves, check safety again, and
    decide to browse to. There's no point in checking the safety of the
    server's reported type, since we're just going to sniff it ourselves.
    
    So just get rid of it.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=610586

 embed/ephy-download.c | 38 ++------------------------------------
 embed/ephy-download.h |  1 -
 2 files changed, 2 insertions(+), 37 deletions(-)

commit 5a5584f882d150324f20e8fc6d44662de3d63653
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Mar 5 13:05:31 2016 -0600

    download: Get rid of EPHY_DOWNLOAD_ACTION_DO_NOTHING
    
    This differs from EPHY_DOWNLOAD_ACTION_NONE in that it explicitly
    informs EphyDownload that it should not perform any download action.
    Maybe that was actually important in the past, but nowadays there's
    absolutely no difference, so just get rid of it.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=610586

 embed/ephy-download.c      | 4 ----
 embed/ephy-download.h      | 3 +--
 src/popup-commands.c       | 1 -
 tests/ephy-download-test.c | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

commit c6b53f506140ba5a83b148cd836a0fce3d00fccd
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Apr 30 16:36:14 2016 -0500

    snapshot-service: Reuse the same SnapshotAsyncData struct
    
    Having too many structs makes this file unnecessarily difficult to read.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765863

 lib/ephy-snapshot-service.c | 136 ++++++++++++--------------------------------
 1 file changed, 36 insertions(+), 100 deletions(-)

commit adc6c404f650d51bf2709ed3d6f70475a0bf1286
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Apr 30 13:50:32 2016 -0500

    snapshot-service: Ensure snapshot freshness in a better location
    
    This reduces the likelihood that we'll duplicate effort in taking a
    snapshot twice, by ensuring we only ever call
    ephy_snapshot_service_take_from_webview in one location.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765863

 lib/ephy-snapshot-service.c | 56 ++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

commit d89374ee0f2653e48143e49f2325c47301f9d603
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Apr 30 13:11:07 2016 -0500

    snapshot-service: Rename memory cache lookup function
    
    To be more clear
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765863

 embed/ephy-about-handler.c  | 2 +-
 lib/ephy-snapshot-service.c | 8 ++++----
 lib/ephy-snapshot-service.h | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 8f3191cb4fab6a2b31c77fc92003eed5ac88845c
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Apr 30 13:05:59 2016 -0500

    snapshot-service: pretty up header file
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765863

 lib/ephy-snapshot-service.h | 53 ++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

commit 3c2fc9bc3c87c6a94ee767f974c0ce8cff6a94d6
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Apr 30 13:00:58 2016 -0500

    snapshot-service: assert that web view has loaded at some point
    
    We should never attempt to get a snapshot from a web view that has never
    loaded anything ever. Instead of attempting to handle this case in a
    nonsensical manner, just assert that it will never happen.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765863

 lib/ephy-snapshot-service.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

commit a97b8e92ade3721cc89788041cedc005876fbd17
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Apr 30 12:48:28 2016 -0500

    snapshot-service: Make ephy_snapshot_service_save private
    
    Requires rearrangements to avoid forward declarations.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765863

 lib/ephy-snapshot-service.c | 285 ++++++++++++++++++++++----------------------
 lib/ephy-snapshot-service.h |  12 --
 2 files changed, 143 insertions(+), 154 deletions(-)

commit 3f0c4a9393489c4828515c9759bee183a2812a2a
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Apr 30 12:15:28 2016 -0500

    snapshot-service: Remove unused functions to retrieve pixbufs
    
    We have a bunch of complicated code to support retrieving GdkPixbufs
    from the snapshot service, but Epiphany does not use these and I don't
    expect it to in the future. The snapshot service is too complex right
    now and it's more important to simplify than to keep dead code around.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765863

 lib/ephy-snapshot-service.c | 229 +-------------------------------------------
 lib/ephy-snapshot-service.h |  24 -----
 2 files changed, 1 insertion(+), 252 deletions(-)

commit 9af9fb9a6afdbb1fc4d15f0704604d7fdd98d002
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Fri Apr 29 09:38:30 2016 -0500

    snapshot-service: Clarify error message
    
    The snapshot service has two caches.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765863

 lib/ephy-snapshot-service.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 050d8bb3d26e7d3887507bc82a8da869d6032ee7
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sun Apr 24 23:05:17 2016 -0500

    web-view-test: Fix return type of visit_url_cb
    
    tartan would have caught this.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765863

 tests/ephy-web-view-test.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit 0cbd04fda4c13c4fdb0241c9f067ddc5f3aa7386
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sun Apr 24 20:53:12 2016 -0500

    snapshot-service: Stop using const time_t
    
    We don't use const in C except for strings. And certainly not for
    pass-by-value.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765863

 lib/ephy-snapshot-service.c | 8 ++++----
 lib/ephy-snapshot-service.h | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

commit bc193027acedbb1599ad8d2a919d86b9103b7b5f
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Wed Apr 13 17:05:19 2016 -0500

    snapshot-service: Always return snapshots immediately if available
    
    Return a stale snapshot, then schedule creation of a new snapshot. This
    way, we show a preexisting snapshot even if snapshot creation fails. The
    new snapshot will be used only for future requests.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763184

 lib/ephy-snapshot-service.c | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

commit 4c4c719dfe363f5a11d28af0e5a0f073127fb7b4
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Fri Apr 29 09:14:47 2016 -0500

    Save the correct thumbnail mtime in the history service
    
    Save the thumbnail mtime when saving thumbnails so it actually reflects
    the mtime embedded in the thumbnail, not the time the page was saved in
    the history service. This regressed in 0433ac9. It's only noticeable now
    due to 9754735, which has resulted in thumbnails regularly disappearing
    from the overview.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763184

 embed/ephy-embed-shell.c    | 19 +++++++++---
 lib/ephy-snapshot-service.c | 70 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 75 insertions(+), 14 deletions(-)

commit 1884ecf19d0a705032f01b4af09b18e0846e83eb
Author: Lapo Calamandrei <calamandrei@gmail.com>
Date:   Thu May 5 19:06:21 2016 +0200

    scss: theme updates and fixes
    
    update and correct the theme scss to reflect changes in gtk+ and
    regenerated the css.

 src/resources/epiphany.css  | 52 +++++++++++++++++++----------------------
 src/resources/epiphany.scss | 56 +++++++++++++++++++++++++++------------------
 2 files changed, 57 insertions(+), 51 deletions(-)

commit 9e6fa0ff764de0fc272d602fe79d01b17a0337b5
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Tue May 3 20:18:20 2016 +0200

    Updated Spanish translation

 po/es.po | 38 ++++++++------------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

commit 7f7504c318badaa1e3b01e43ebce90d5da224af9
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Tue May 3 17:42:02 2016 +0200

    Use https in DDG lt and tr translations

 po/lt.po | 2 +-
 po/tr.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 1a6b8b30f44d0704f6215d5c2f2832954852e3f9
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Tue May 3 17:40:56 2016 +0200

    Fix GSettings default value translations

 po/bg.po  | 2 +-
 po/cs.po  | 2 +-
 po/da.po  | 2 +-
 po/de.po  | 2 +-
 po/fi.po  | 2 +-
 po/fr.po  | 2 +-
 po/fur.po | 2 +-
 po/it.po  | 2 +-
 po/ja.po  | 2 +-
 po/ko.po  | 2 +-
 po/lt.po  | 2 +-
 po/lv.po  | 2 +-
 po/nb.po  | 2 +-
 po/sk.po  | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

commit db35de0789ee8f962079abb154a010512fdb90ed
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sun May 1 14:27:53 2016 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 408 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 220 insertions(+), 188 deletions(-)

commit fbbf821708cd10ebf02a31d6e6781bb74abdc697
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sun May 1 14:24:07 2016 +0200

    Updated Norwegian bokmål translation.

 po/nb.po | 916 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 447 insertions(+), 469 deletions(-)

commit 07efd4fc021034a7a30c9ef23f05d0b1894309e9
Author: Michael Catanzaro <mcatanzaro@igalia.com>
Date:   Sat Apr 30 19:15:04 2016 -0500

    theme: Fix background image color
    
    Per advice of Lapo

 src/resources/epiphany.css  | 4 ++--
 src/resources/epiphany.scss | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 8e2240891a0194849870c4c2c5236d6c00069ae2
Author: Balázs Meskó <meskobalazs@gmail.com>
Date:   Sat Apr 30 09:23:02 2016 +0000

    Updated Hungarian translation

 po/hu.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

commit af76364c26005d38c94fd37763f976b9b7f98e23
Author: Gabriel Ivascu <ivascu.gabriel59@gmail.com>
Date:   Thu Apr 28 15:46:30 2016 +0300

    Close <p> tag
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765724

 embed/ephy-web-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3dd8da58699af374df76b452a89133b172896458
Author: Balázs Meskó <meskobalazs@gmail.com>
Date:   Wed Apr 27 20:07:43 2016 +0000

    Updated Hungarian translation

 po/hu.po | 1195 ++++++++++++++++++++++++++++++++------------------------------
 1 file changed, 619 insertions(+), 576 deletions(-)

commit 15069a89221d82b385de29db05de3bc9d8eb23fe
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed Apr 27 20:56:32 2016 +0200

    Updated Spanish translation

 po/es.po | 1223 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 648 insertions(+), 575 deletions(-)

commit 28494659608e132a03a9bd8f66703bfc6af00e81
Author: Fabio Tomat <f.t.public@gmail.com>
Date:   Wed Apr 27 07:36:21 2016 +0000

    Updated Friulian translation

 po/fur.po | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

commit ac089f4b2c2da17f019ffbbdbb9f4925e7d83e62
Author: Fabio Tomat <f.t.public@gmail.com>
Date:   Wed Apr 27 07:19:18 2016 +0000

    Updated Friulian translation

 po/fur.po | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

commit 05f2a8b14df42e2915c9eebdceb3761241ce0c49
Author: Fabio Tomat <f.t.public@gmail.com>
Date:   Tue Apr 26 22:05:28 2016 +0000

    Updated Friulian translation

 po/fur.po | 501 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 279 insertions(+), 222 deletions(-)