[epiphany/bilelmoussaoui/wip-elementary-flatpak] Flatpak: Make testing elementary version of Epiphany easier

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit cf8ae04586e1f639b63d7010b317cff6c3102714
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Thu Jun 13 23:11:38 2019 +0200

    Flatpak: Make testing elementary version of Epiphany easier
    
    This includes a new flatpak manifest, the reason is that we need to use the io.elementary.BaseApp//juno 
in order to get the stylesheet and the icons.

 org.gnome.Epiphany.elementary.json | 88 ++++++++++++++++++++++++++++++++++++++
 src/ephy-window.c                  | 12 ++++++
 2 files changed, 100 insertions(+)
---
diff --git a/org.gnome.Epiphany.elementary.json b/org.gnome.Epiphany.elementary.json
new file mode 100644
index 000000000..c63819b27
--- /dev/null
+++ b/org.gnome.Epiphany.elementary.json
@@ -0,0 +1,88 @@
+{
+    "app-id" : "org.gnome.Epiphany.Devel",
+    "base": "io.elementary.BaseApp",
+    "base-version": "juno",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "master",
+    "sdk" : "org.gnome.Sdk",
+    "command" : "epiphany",
+    "tags" : [
+        "nightly"
+    ],
+    "desktop-file-name-suffix" : " (Epiphany Technology Preview)",
+    "finish-args" : [
+        "--share=ipc",
+        "--socket=x11",
+        "--socket=wayland",
+        "--device=dri",
+        "--share=network",
+        "--socket=pulseaudio",
+        "--system-talk-name=org.freedesktop.GeoClue2",
+        "--filesystem=xdg-run/dconf",
+        "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf",
+        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+        "--talk-name=org.freedesktop.secrets",
+        "--filesystem=xdg-download",
+        "--talk-name=org.freedesktop.Notifications",
+        "--env=XDG_CURRENT_DESKTOP=Panatheon"
+    ],
+    "cleanup" : [
+        "/include",
+        "/lib/pkgconfig",
+        "/share/pkgconfig",
+        "/share/aclocal",
+        "/man",
+        "/share/man",
+        "/share/gtk-doc",
+        "*.la",
+        "*.a"
+    ],
+    "modules" : [
+        {
+            "name" : "libdazzle",
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/libdazzle.git";
+                }
+            ]
+        },
+        {
+            "name" : "libhandy",
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "config-opts" : [
+                "-Dexamples=false",
+                "-Dglade_catalog=disabled",
+                "-Dintrospection=disabled",
+                "-Dtests=false",
+                "-Dvapi=false"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://source.puri.sm/Librem5/libhandy.git";
+                }
+            ]
+        },
+        {
+            "name" : "epiphany",
+            "config-opts" : [
+                "-Dtech_preview=true",
+                "-Dprofile=Devel"
+            ],
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/epiphany.git";,
+                    "disable-shallow-clone" : true
+                }
+            ]
+        }
+    ]
+}
diff --git a/src/ephy-window.c b/src/ephy-window.c
index ad4cb3be6..9e3e7b7ea 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -28,6 +28,7 @@
 #include "ephy-action-helper.h"
 #include "ephy-bookmarks-manager.h"
 #include "ephy-debug.h"
+#include "ephy-desktop-utils.h"
 #include "ephy-embed-container.h"
 #include "ephy-embed-prefs.h"
 #include "ephy-embed-shell.h"
@@ -3787,6 +3788,17 @@ static void
 ephy_window_init (EphyWindow *window)
 {
   LOG ("EphyWindow initialising %p", window);
+  if (is_desktop_pantheon ()) {
+    GtkSettings *settings = gtk_settings_get_default();
+    g_object_set(settings,
+                 "gtk-icon-theme-name",
+                 "elementary",
+                 NULL);
+    g_object_set(settings,
+             "gtk-theme-name",
+             "elementary",
+             NULL);
+  }
 }
 
 /**