[ekiga] Modernized RosterViewGtk's GObject code
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Modernized RosterViewGtk's GObject code
- Date: Wed, 10 Nov 2010 10:03:22 +0000 (UTC)
commit 097c63fb1d3f65ed56932827edd7a59e4ce8032d
Author: Snark <jpuydt gnome org>
Date: Tue Nov 9 13:53:24 2010 +0100
Modernized RosterViewGtk's GObject code
lib/engine/gui/gtk-frontend/roster-view-gtk.cpp | 50 +++++------------------
1 files changed, 10 insertions(+), 40 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index e502513..377b0e8 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -83,8 +83,7 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
-static GObjectClass *parent_class = NULL;
-
+G_DEFINE_TYPE (RosterViewGtk, roster_view_gtk, GTK_TYPE_FRAME);
/* This is how things will be stored roughly :
* - the heaps are at the top ;
@@ -1316,7 +1315,7 @@ roster_view_gtk_dispose (GObject *obj)
view->priv->tree_view = NULL;
}
- parent_class->dispose (obj);
+ G_OBJECT_CLASS (roster_view_gtk_parent_class)->dispose (obj);
}
@@ -1329,19 +1328,20 @@ roster_view_gtk_finalize (GObject *obj)
delete view->priv;
- parent_class->finalize (obj);
+ G_OBJECT_CLASS (roster_view_gtk_parent_class)->finalize (obj);
}
-
static void
-roster_view_gtk_class_init (gpointer g_class,
- gpointer /*class_data*/)
+roster_view_gtk_init (G_GNUC_UNUSED RosterViewGtk* self)
{
- GObjectClass *gobject_class = NULL;
+ /* we can't do anything here because we don't have the core :-/ */
+}
- parent_class = (GObjectClass *) g_type_class_peek_parent (g_class);
+static void
+roster_view_gtk_class_init (RosterViewGtkClass* klass)
+{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- gobject_class = (GObjectClass *) g_class;
gobject_class->dispose = roster_view_gtk_dispose;
gobject_class->finalize = roster_view_gtk_finalize;
@@ -1355,36 +1355,6 @@ roster_view_gtk_class_init (gpointer g_class,
G_TYPE_NONE, 0);
}
-
-GType
-roster_view_gtk_get_type ()
-{
- static GType result = 0;
-
- if (result == 0) {
-
- static const GTypeInfo info = {
- sizeof (RosterViewGtkClass),
- NULL,
- NULL,
- roster_view_gtk_class_init,
- NULL,
- NULL,
- sizeof (RosterViewGtk),
- 0,
- NULL,
- NULL
- };
-
- result = g_type_register_static (GTK_TYPE_FRAME,
- "RosterViewGtk",
- &info, (GTypeFlags) 0);
- }
-
- return result;
-}
-
-
/*
* Public API
*/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]