diff options
| author | Xan Lopez <xan@src.gnome.org> | 2008-02-11 02:26:22 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@src.gnome.org> | 2008-02-11 02:26:22 +0800 |
| commit | a6753733856e098e2500487fee87620f72dea530 (patch) | |
| tree | 1f5a7d8ae16bd2e3070bbdc31791eef96952a233 /src/ephy-net-monitor.c | |
| parent | 9a3e4ebc55e11c3b00b0e7464b11ecec121bc6f2 (diff) | |
| download | gsoc2013-epiphany-a6753733856e098e2500487fee87620f72dea530.tar gsoc2013-epiphany-a6753733856e098e2500487fee87620f72dea530.tar.gz gsoc2013-epiphany-a6753733856e098e2500487fee87620f72dea530.tar.bz2 gsoc2013-epiphany-a6753733856e098e2500487fee87620f72dea530.tar.lz gsoc2013-epiphany-a6753733856e098e2500487fee87620f72dea530.tar.xz gsoc2013-epiphany-a6753733856e098e2500487fee87620f72dea530.tar.zst gsoc2013-epiphany-a6753733856e098e2500487fee87620f72dea530.zip | |
Use G_DEFINE_TYPE* when possible in src/ (#515601)
svn path=/trunk/; revision=7927
Diffstat (limited to 'src/ephy-net-monitor.c')
| -rw-r--r-- | src/ephy-net-monitor.c | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/src/ephy-net-monitor.c b/src/ephy-net-monitor.c index e73abfabb..6ac0a9363 100644 --- a/src/ephy-net-monitor.c +++ b/src/ephy-net-monitor.c @@ -56,7 +56,7 @@ enum PROP_NETWORK_STATUS }; -static GObjectClass *parent_class; +G_DEFINE_TYPE (EphyNetMonitor, ephy_net_monitor, G_TYPE_OBJECT) static void ephy_net_monitor_set_net_status (EphyNetMonitor *monitor, @@ -331,7 +331,7 @@ ephy_net_monitor_dispose (GObject *object) priv->notify_id = 0; } - parent_class->dispose (object); + G_OBJECT_CLASS (ephy_net_monitor_parent_class)->dispose (object); } static void @@ -355,8 +355,6 @@ ephy_net_monitor_class_init (EphyNetMonitorClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - object_class->dispose = ephy_net_monitor_dispose; object_class->get_property = ephy_net_monitor_get_property; @@ -379,34 +377,6 @@ ephy_net_monitor_class_init (EphyNetMonitorClass *klass) /* public API */ -GType -ephy_net_monitor_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) - { - const GTypeInfo our_info = - { - sizeof (EphyShellClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) ephy_net_monitor_class_init, - NULL, - NULL, /* class_data */ - sizeof (EphyNetMonitor), - 0, /* n_preallocs */ - (GInstanceInitFunc) ephy_net_monitor_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "EphyNetMonitor", - &our_info, 0); - } - - return type; -} - EphyNetMonitor * ephy_net_monitor_new (void) { |