diff options
| author | vanadiae <vanadiae35@gmail.com> | 2020-05-21 15:31:53 +0200 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-05-30 15:58:55 +0000 |
| commit | ff86da538860220ae67c4530153af428fbd17639 (patch) | |
| tree | 4436ef81eef0d10a7851f412bd492e9207c7ad3b | |
| parent | 229581b03186a2ec596c42ed54865a9f46adb4e6 (diff) | |
| download | epiphany-ff86da538860220ae67c4530153af428fbd17639.tar.gz | |
image-as-wallpaper: disable in flatpak until full support
Currently, setting an image as wallpaper in a flatpak is totally
broken. So disable for 3.36 and a fix will be pushed for 3.38.
| -rw-r--r-- | src/ephy-window.c | 6 | ||||
| -rw-r--r-- | src/popup-commands.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index 2e57f7fb5..527e213b6 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -37,6 +37,7 @@ #include "ephy-file-helpers.h" #include "ephy-filters-manager.h" #include "ephy-find-toolbar.h" +#include "ephy-flatpak-utils.h" #include "ephy-gsb-utils.h" #include "ephy-gui.h" #include "ephy-header-bar.h" @@ -1717,8 +1718,9 @@ populate_context_menu (WebKitWebView *web_view, add_action_to_context_menu (context_menu, popup_action_group, "view-image", window); - add_action_to_context_menu (context_menu, popup_action_group, - "set-image-as-background", window); + if (!ephy_is_running_inside_flatpak ()) + add_action_to_context_menu (context_menu, popup_action_group, + "set-image-as-background", window); } if (is_media) { diff --git a/src/popup-commands.c b/src/popup-commands.c index 1ca72e48d..e5e49c4e9 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -27,6 +27,7 @@ #include "ephy-embed-utils.h" #include "ephy-file-chooser.h" #include "ephy-file-helpers.h" +#include "ephy-flatpak-utils.h" #include "ephy-prefs.h" #include "ephy-settings.h" #include "ephy-shell.h" @@ -271,6 +272,9 @@ popup_cmd_set_image_as_background (GSimpleAction *action, GValue value = { 0, }; EphyDownload *download; + if (ephy_is_running_inside_flatpak ()) + return; + event = ephy_window_get_context_event (EPHY_WINDOW (user_data)); g_assert (event != NULL); |