[epiphany] image-as-wallpaper: disable in flatpak until full support
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] image-as-wallpaper: disable in flatpak until full support
- Date: Sat, 22 Aug 2020 19:07:47 +0000 (UTC)
commit bf26e834eeb3c77186e0115efa7f685e51b864c7
Author: vanadiae <vanadiae35 gmail com>
Date: Thu May 21 13:31:53 2020 +0000
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.
(cherry picked from commit ff86da538860220ae67c4530153af428fbd17639)
src/ephy-window.c | 6 ++++--
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 975c03fb3..57b327745 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"
@@ -1743,8 +1744,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 92cebb1c9..40ff2f4d9 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"
@@ -273,6 +274,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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]