diff options
| author | Xan Lopez <xan@src.gnome.org> | 2008-02-18 07:23:36 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@src.gnome.org> | 2008-02-18 07:23:36 +0800 |
| commit | f0f2a211a474b2b5fccdaa5a15a5e3fb27866f3a (patch) | |
| tree | cd6ef67c3cb63ac81206f2a22175c3b8dd64e565 /embed/ephy-embed-shell.c | |
| parent | 2f3e9b5994ebec0a15f6c3ba691732b38a4fbe22 (diff) | |
| download | gsoc2013-epiphany-f0f2a211a474b2b5fccdaa5a15a5e3fb27866f3a.tar gsoc2013-epiphany-f0f2a211a474b2b5fccdaa5a15a5e3fb27866f3a.tar.gz gsoc2013-epiphany-f0f2a211a474b2b5fccdaa5a15a5e3fb27866f3a.tar.bz2 gsoc2013-epiphany-f0f2a211a474b2b5fccdaa5a15a5e3fb27866f3a.tar.lz gsoc2013-epiphany-f0f2a211a474b2b5fccdaa5a15a5e3fb27866f3a.tar.xz gsoc2013-epiphany-f0f2a211a474b2b5fccdaa5a15a5e3fb27866f3a.tar.zst gsoc2013-epiphany-f0f2a211a474b2b5fccdaa5a15a5e3fb27866f3a.zip | |
Use G_DEFINE_TYPE* where possible in embed/* (#517090)
svn path=/trunk/; revision=7964
Diffstat (limited to 'embed/ephy-embed-shell.c')
| -rw-r--r-- | embed/ephy-embed-shell.c | 38 |
1 files changed, 4 insertions, 34 deletions
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c index 17334526c..067f7ae1b 100644 --- a/embed/ephy-embed-shell.c +++ b/embed/ephy-embed-shell.c @@ -68,42 +68,14 @@ enum LAST_SIGNAL }; -static guint signals[LAST_SIGNAL] = { 0 }; +static guint signals[LAST_SIGNAL]; static void ephy_embed_shell_class_init (EphyEmbedShellClass *klass); static void ephy_embed_shell_init (EphyEmbedShell *shell); EphyEmbedShell *embed_shell = NULL; -static GObjectClass *parent_class = NULL; - -GType -ephy_embed_shell_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) - { - const GTypeInfo our_info = - { - sizeof (EphyEmbedShellClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) ephy_embed_shell_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (EphyEmbedShell), - 0, /* n_preallocs */ - (GInstanceInitFunc) ephy_embed_shell_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "EphyEmbedShell", - &our_info, 0); - } - - return type; -} +G_DEFINE_TYPE (EphyEmbedShell, ephy_embed_shell, G_TYPE_OBJECT) static void ephy_embed_shell_dispose (GObject *object) @@ -148,7 +120,7 @@ ephy_embed_shell_dispose (GObject *object) priv->print_settings = NULL; } - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (ephy_embed_shell_parent_class)->dispose (object); } static void @@ -175,7 +147,7 @@ ephy_embed_shell_finalize (GObject *object) shell->priv->adblock_manager = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (ephy_embed_shell_parent_class)->finalize (object); } /** @@ -324,8 +296,6 @@ ephy_embed_shell_class_init (EphyEmbedShellClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - parent_class = (GObjectClass *) g_type_class_peek_parent (klass); - object_class->dispose = ephy_embed_shell_dispose; object_class->finalize = ephy_embed_shell_finalize; |