aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-shell.c
diff options
context:
space:
mode:
authorXan Lopez <xlopez@igalia.com>2011-06-29 04:56:08 +0800
committerXan Lopez <xlopez@igalia.com>2011-06-29 20:53:01 +0800
commitf939f5ce3406a77b500e821815352d22ff410ab7 (patch)
tree2d47cc4280158c5410da31b8a1543fe51100864a /src/ephy-shell.c
parentbd14d50456be46422d955a4290fb27e964a0b5b2 (diff)
downloadgsoc2013-epiphany-f939f5ce3406a77b500e821815352d22ff410ab7.tar
gsoc2013-epiphany-f939f5ce3406a77b500e821815352d22ff410ab7.tar.gz
gsoc2013-epiphany-f939f5ce3406a77b500e821815352d22ff410ab7.tar.bz2
gsoc2013-epiphany-f939f5ce3406a77b500e821815352d22ff410ab7.tar.lz
gsoc2013-epiphany-f939f5ce3406a77b500e821815352d22ff410ab7.tar.xz
gsoc2013-epiphany-f939f5ce3406a77b500e821815352d22ff410ab7.tar.zst
gsoc2013-epiphany-f939f5ce3406a77b500e821815352d22ff410ab7.zip
Require an EphyApplication parameter when creating an EphyShell
We'll want to create our own in main(), this prepares us for that.
Diffstat (limited to 'src/ephy-shell.c')
-rw-r--r--src/ephy-shell.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 1de265b6a..5ebd1f21c 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -202,8 +202,6 @@ ephy_shell_init (EphyShell *shell)
ephy_shell = shell;
g_object_add_weak_pointer (G_OBJECT(ephy_shell),
(gpointer *)ptr);
-
- shell->priv->application = ephy_application_new ();
}
static void
@@ -815,7 +813,7 @@ ephy_shell_get_application (EphyShell *shell)
}
void
-_ephy_shell_create_instance (void)
+_ephy_shell_create_instance (EphyApplication *application)
{
g_assert (ephy_shell == NULL);
@@ -823,4 +821,9 @@ _ephy_shell_create_instance (void)
/* FIXME weak ref */
g_assert (ephy_shell != NULL);
+
+ if (application)
+ ephy_shell->priv->application = g_object_ref (application);
+ else
+ ephy_shell->priv->application = ephy_application_new ();
}