aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-window.c
diff options
context:
space:
mode:
authorXan Lopez <xlopez@igalia.com>2011-06-30 01:55:28 +0800
committerXan Lopez <xlopez@igalia.com>2011-06-30 01:55:28 +0800
commit4c444c0f7693b9a0f3058729bea04832b66d6214 (patch)
treed91f6fafd638bd19c9421fd1eaf56dde5db12741 /src/ephy-window.c
parent7628d25419c00d95da3e104ad6f132f4607b78c0 (diff)
downloadgsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar
gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.gz
gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.bz2
gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.lz
gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.xz
gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.tar.zst
gsoc2013-epiphany-4c444c0f7693b9a0f3058729bea04832b66d6214.zip
Merge EphyApplication into Ephy(Embed)Shell
We want to use EphyApplication from embed/ too, so instead of following the EphyEmbedShell/EphyShell pattern just fold the code into the Shell itself. This makes sense since both classes have basically the same function, and we can easily leave the non-embed code in EphyShell and move to EphyEmbedShell the bits we want to be global. The better name would be EphyCoreApplication/EphyApplication for the resulting object, but we can do this later.
Diffstat (limited to 'src/ephy-window.c')
-rw-r--r--src/ephy-window.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 67bd63e39..a10b81034 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -3837,7 +3837,7 @@ ephy_window_constructor (GType type,
proxy = GTK_WIDGET (proxies->data);
priv->entry = ephy_location_entry_get_entry (EPHY_LOCATION_ENTRY (proxy));
gtk_window_set_application (GTK_WINDOW (window),
- GTK_APPLICATION (ephy_shell_get_application (ephy_shell_get_default ())));
+ GTK_APPLICATION (ephy_shell_get_default ()));
}
return object;