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

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit cfb5dd78e888075e2a479fc5fa2605fbb6bda3ef
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 as the elementary baseApp that contains the gtk/icons themes from elementary.
    Changing the XDG_CURRENT_DESKTOP to Pantheon should allow easier testing"

 org.gnome.Epiphany.json |  2 ++
 src/ephy-window.c       | 12 ++++++++++++
 2 files changed, 14 insertions(+)
---
diff --git a/org.gnome.Epiphany.json b/org.gnome.Epiphany.json
index c37534b6a..7e766d785 100644
--- a/org.gnome.Epiphany.json
+++ b/org.gnome.Epiphany.json
@@ -1,5 +1,7 @@
 {
     "app-id" : "org.gnome.Epiphany.Devel",
+    "base": "io.elementary.BaseApp",
+    "base-version": "juno",
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
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);
+  }
 }
 
 /**