[rhythmbox] Adapt to GtkObject removal in GTK3
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] Adapt to GtkObject removal in GTK3
- Date: Mon, 27 Sep 2010 15:59:03 +0000 (UTC)
commit ad8a802e5e56ba8e29f3542e3099929784709991
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Sep 27 11:57:18 2010 -0400
Adapt to GtkObject removal in GTK3
The changes here just avoid unneeded GtkObjectClass variables.
Bug 630689
sources/rb-sourcelist-model.c | 4 +---
sources/rb-sourcelist.c | 10 ++++------
2 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/sources/rb-sourcelist-model.c b/sources/rb-sourcelist-model.c
index bbc8eb3..fe563f1 100644
--- a/sources/rb-sourcelist-model.c
+++ b/sources/rb-sourcelist-model.c
@@ -152,10 +152,8 @@ static void
rb_sourcelist_model_class_init (RBSourceListModelClass *class)
{
GObjectClass *o_class;
- GtkObjectClass *object_class;
o_class = (GObjectClass *) class;
- object_class = (GtkObjectClass *) class;
o_class->finalize = rb_sourcelist_model_finalize;
@@ -170,7 +168,7 @@ rb_sourcelist_model_class_init (RBSourceListModelClass *class)
*/
rb_sourcelist_model_signals[DROP_RECEIVED] =
g_signal_new ("drop_received",
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSourceListModelClass, drop_received),
NULL, NULL,
diff --git a/sources/rb-sourcelist.c b/sources/rb-sourcelist.c
index da73899..8f42726 100644
--- a/sources/rb-sourcelist.c
+++ b/sources/rb-sourcelist.c
@@ -132,10 +132,8 @@ static void
rb_sourcelist_class_init (RBSourceListClass *class)
{
GObjectClass *o_class;
- GtkObjectClass *object_class;
o_class = (GObjectClass *) class;
- object_class = (GtkObjectClass *) class;
o_class->constructed = rb_sourcelist_constructed;
o_class->finalize = rb_sourcelist_finalize;
@@ -176,7 +174,7 @@ rb_sourcelist_class_init (RBSourceListClass *class)
*/
rb_sourcelist_signals[SELECTED] =
g_signal_new ("selected",
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSourceListClass, selected),
NULL, NULL,
@@ -195,7 +193,7 @@ rb_sourcelist_class_init (RBSourceListClass *class)
*/
rb_sourcelist_signals[DROP_RECEIVED] =
g_signal_new ("drop_received",
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSourceListClass, drop_received),
NULL, NULL,
@@ -214,7 +212,7 @@ rb_sourcelist_class_init (RBSourceListClass *class)
*/
rb_sourcelist_signals[SOURCE_ACTIVATED] =
g_signal_new ("source_activated",
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSourceListClass, source_activated),
NULL, NULL,
@@ -233,7 +231,7 @@ rb_sourcelist_class_init (RBSourceListClass *class)
*/
rb_sourcelist_signals[SHOW_POPUP] =
g_signal_new ("show_popup",
- G_OBJECT_CLASS_TYPE (object_class),
+ G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (RBSourceListClass, show_popup),
NULL, NULL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]