diff options
| author | Vincent Untz <vuntz@gnome.org> | 2007-06-11 22:12:34 +0000 |
|---|---|---|
| committer | Vincent Untz <vuntz@src.gnome.org> | 2007-06-11 22:12:34 +0000 |
| commit | 041365fef6ecc72df724e695b4821358c1a22b2d (patch) | |
| tree | 21280013e7ec664dec784b42709bfac22e748ea8 /libwnck/window.c | |
| parent | 292a6df2afcfbf6a2c84ea0f6eebb1c9eb135714 (diff) | |
| download | libwnck-041365fef6ecc72df724e695b4821358c1a22b2d.tar.gz | |
Use G_DEFINE_TYPE.
2007-06-12 Vincent Untz <vuntz@gnome.org>
Use G_DEFINE_TYPE.
* libwnck/application.c: (wnck_application_class_init),
(wnck_application_finalize):
* libwnck/class-group.c: (wnck_class_group_class_init),
(wnck_class_group_finalize):
* libwnck/pager-accessible-factory.c:
(wnck_pager_accessible_factory_init):
* libwnck/pager.c: (wnck_pager_class_init), (wnck_pager_finalize),
(_wnck_pager_set_screen), (wnck_pager_unrealize),
(wnck_pager_size_request), (wnck_pager_size_allocate),
(wnck_pager_focus), (wnck_pager_get_accessible):
* libwnck/screen.c: (wnck_screen_class_init),
(wnck_screen_finalize):
* libwnck/tasklist.c: (wnck_task_class_init), (wnck_task_finalize),
(wnck_tasklist_class_init), (wnck_tasklist_finalize),
(wnck_tasklist_size_allocate), (wnck_tasklist_realize),
(wnck_tasklist_unrealize), (wnck_tasklist_expose):
* libwnck/window.c: (wnck_window_class_init),
(wnck_window_finalize):
* libwnck/workspace-accessible-factory.c:
(wnck_workspace_accessible_factory_init):
* libwnck/workspace.c: (wnck_workspace_class_init),
(wnck_workspace_finalize):
Remove the get_type() functions, and update all the parent_class
references.
svn path=/trunk/; revision=1303
Diffstat (limited to 'libwnck/window.c')
| -rw-r--r-- | libwnck/window.c | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/libwnck/window.c b/libwnck/window.c index 7933090..d434cbc 100644 --- a/libwnck/window.c +++ b/libwnck/window.c @@ -156,6 +156,8 @@ struct _WnckWindowPrivate guint need_emit_icon_changed : 1; }; +G_DEFINE_TYPE (WnckWindow, wnck_window, G_TYPE_OBJECT); + enum { NAME_CHANGED, STATE_CHANGED, @@ -199,40 +201,8 @@ static void force_update_now (WnckWindow *window); static WnckWindow* find_last_transient_for (GList *windows, Window xwindow); -static gpointer parent_class; static guint signals[LAST_SIGNAL] = { 0 }; -GType -wnck_window_get_type (void) -{ - static GType object_type = 0; - - g_type_init (); - - if (!object_type) - { - const GTypeInfo object_info = - { - sizeof (WnckWindowClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) wnck_window_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (WnckWindow), - 0, /* n_preallocs */ - (GInstanceInitFunc) wnck_window_init, - NULL /* value_table */ - }; - - object_type = g_type_register_static (G_TYPE_OBJECT, - "WnckWindow", - &object_info, 0); - } - - return object_type; -} - static void wnck_window_init (WnckWindow *window) { @@ -251,8 +221,6 @@ wnck_window_class_init (WnckWindowClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - parent_class = g_type_class_peek_parent (klass); - object_class->finalize = wnck_window_finalize; /** @@ -388,7 +356,7 @@ wnck_window_finalize (GObject *object) g_free (window->priv); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (wnck_window_parent_class)->finalize (object); } /** |