aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorCarlos Garcia Campos <cgarcia@igalia.com>2013-03-28 22:56:23 +0800
committerCarlos Garcia Campos <carlosgc@gnome.org>2013-04-05 17:43:21 +0800
commitefccc1eac4ac4e15fd4f5695d27a85c7d25c3cc6 (patch)
tree0c77cd96faff179f977cf25ff375c241a7320414 /src/Makefile.am
parent921cc71d8092e41f5d8cec0c652d14059c9fb6a8 (diff)
downloadgsoc2013-epiphany-efccc1eac4ac4e15fd4f5695d27a85c7d25c3cc6.tar
gsoc2013-epiphany-efccc1eac4ac4e15fd4f5695d27a85c7d25c3cc6.tar.gz
gsoc2013-epiphany-efccc1eac4ac4e15fd4f5695d27a85c7d25c3cc6.tar.bz2
gsoc2013-epiphany-efccc1eac4ac4e15fd4f5695d27a85c7d25c3cc6.tar.lz
gsoc2013-epiphany-efccc1eac4ac4e15fd4f5695d27a85c7d25c3cc6.tar.xz
gsoc2013-epiphany-efccc1eac4ac4e15fd4f5695d27a85c7d25c3cc6.tar.zst
gsoc2013-epiphany-efccc1eac4ac4e15fd4f5695d27a85c7d25c3cc6.zip
Unify all web context setup in EphyEmbedShell on primary instance startup
Cookies, web extension and custom URI handlers were initialized in ephy_embed_shell_init(), so they were always called even for secondary instances. All other initializations were in ephy_shell_startup so that it only happens for the primary instance. Move all the code to ephy_embed_shell_startup to make sure everything happens at the same time and only for the primary instance. https://bugzilla.gnome.org/show_bug.cgi?id=696020
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0b38aa816..290ca0fb0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -86,7 +86,6 @@ libephymain_la_CPPFLAGS = \
-DLOADER_DIR=\""$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders"\" \
-DDATADIR=\""$(pkgdatadir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
- -DEPHY_WEB_EXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions"\" \
$(AM_CPPFLAGS)
if WITH_WEBKIT2