diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2016-11-21 17:55:16 -0600 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2016-11-21 18:05:41 -0600 |
| commit | 6ff26acccd0b90ec364681dc7d87b76818b6349f (patch) | |
| tree | b4a25fa505f92d866781b8abd86bed43c4e9d51e /lib/widgets | |
| parent | 28e9892775428a80c8819f5522387beaca1b6d22 (diff) | |
| download | epiphany-6ff26acccd0b90ec364681dc7d87b76818b6349f.tar.gz | |
Really handle focus stealing prevention properly"
This reverts commit 0283906a4ba772d447bde4a9c5b738a6e027edaa and also
fixes the bug, all in one!
The original commit was not correct: it conflated UNIX time
(g_get_real_time) with X11 time (gtk_get_current_event_time). The
easiest way to fix it would be to simply call the later instead of the
former, but I also want to revert to using the more explicit API where
the caller must pass the user time manually, so do that too.
Diffstat (limited to 'lib/widgets')
| -rw-r--r-- | lib/widgets/ephy-download-widget.c | 3 | ||||
| -rw-r--r-- | lib/widgets/ephy-downloads-popover.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/widgets/ephy-download-widget.c b/lib/widgets/ephy-download-widget.c index 2e905c5b6..659675fd8 100644 --- a/lib/widgets/ephy-download-widget.c +++ b/lib/widgets/ephy-download-widget.c @@ -274,7 +274,8 @@ widget_action_button_clicked_cb (EphyDownloadWidget *widget) ephy_downloads_manager_remove_download (manager, widget->download); } else { ephy_download_do_download_action (widget->download, - EPHY_DOWNLOAD_ACTION_BROWSE_TO); + EPHY_DOWNLOAD_ACTION_BROWSE_TO, + gtk_get_current_event_time ()); } } diff --git a/lib/widgets/ephy-downloads-popover.c b/lib/widgets/ephy-downloads-popover.c index 6d1dce9ac..060e98e25 100644 --- a/lib/widgets/ephy-downloads-popover.c +++ b/lib/widgets/ephy-downloads-popover.c @@ -50,7 +50,9 @@ download_box_row_activated_cb (EphyDownloadsPopover *popover, if (!ephy_download_succeeded (download)) return; - ephy_download_do_download_action (download, EPHY_DOWNLOAD_ACTION_OPEN); + ephy_download_do_download_action (download, + EPHY_DOWNLOAD_ACTION_OPEN, + gtk_get_current_event_time ()); } static void |