aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@igalia.com>2012-09-08 18:11:44 +0800
committerXan Lopez <xan@igalia.com>2012-09-08 18:11:44 +0800
commit87b95b1006581e71ffbb80c45005108e81392596 (patch)
tree03692e5eef666264fe3666a2f7c1c1a630f16688
parent1ba7ab5e529d93f8913b4b89f13f9f24fd715761 (diff)
downloadgsoc2013-epiphany-87b95b1006581e71ffbb80c45005108e81392596.tar.gz
gsoc2013-epiphany-87b95b1006581e71ffbb80c45005108e81392596.tar.zst
gsoc2013-epiphany-87b95b1006581e71ffbb80c45005108e81392596.zip
ephy-embed-shell: small cleanups
-rw-r--r--embed/ephy-embed-shell.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 2ddbd4fd7..fe663684d 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -82,9 +82,6 @@ enum
static GParamSpec *object_properties[N_PROPERTIES] = { NULL, };
-static void ephy_embed_shell_class_init (EphyEmbedShellClass *klass);
-static void ephy_embed_shell_init (EphyEmbedShell *shell);
-
EphyEmbedShell *embed_shell = NULL;
G_DEFINE_TYPE (EphyEmbedShell, ephy_embed_shell, GTK_TYPE_APPLICATION)
@@ -92,8 +89,7 @@ G_DEFINE_TYPE (EphyEmbedShell, ephy_embed_shell, GTK_TYPE_APPLICATION)
static void
ephy_embed_shell_dispose (GObject *object)
{
- EphyEmbedShell *shell = EPHY_EMBED_SHELL (object);
- EphyEmbedShellPrivate *priv = shell->priv;
+ EphyEmbedShellPrivate *priv = EPHY_EMBED_SHELL (object)->priv;
g_clear_object (&priv->encodings);
g_clear_object (&priv->page_setup);
@@ -109,14 +105,14 @@ ephy_embed_shell_dispose (GObject *object)
static void
ephy_embed_shell_finalize (GObject *object)
{
- EphyEmbedShell *shell = EPHY_EMBED_SHELL (object);
+ EphyEmbedShellPrivate *priv = EPHY_EMBED_SHELL (object)->priv;
- if (shell->priv->downloads != NULL)
+ if (priv->downloads != NULL)
{
LOG ("Destroying downloads list");
- g_list_foreach (shell->priv->downloads, (GFunc) g_object_unref, NULL);
- g_list_free (shell->priv->downloads);
- shell->priv->downloads = NULL;
+ g_list_foreach (priv->downloads, (GFunc)g_object_unref, NULL);
+ g_list_free (priv->downloads);
+ priv->downloads = NULL;
}
G_OBJECT_CLASS (ephy_embed_shell_parent_class)->finalize (object);