GNOME.org
 

[brasero] Adapt to GtkObject removal in GTK3

commit 7f700c8d4944830992d7d970e17a4de0f8458338
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Sep 27 11:47:26 2010 -0400

    Adapt to GtkObject removal in GTK3
    
    Most of the changes here move destroy implementations to GtkWidgetClass
    instead of GtkObjectClass, and adapt the destroy signature.
    
    Bug 630675

 libbrasero-burn/brasero-burn-dialog.c  |    9 ++++-----
 libbrasero-utils/brasero-jacket-view.c |    8 ++++----
 src/brasero-app.c                      |    2 +-
 src/brasero-layout.c                   |   11 +----------
 src/brasero-player-bacon.c             |    9 ++++-----
 src/brasero-player.c                   |   11 ++++++-----
 src/brasero-playlist.c                 |   10 +++++-----
 src/brasero-search-entry.c             |    9 ---------
 src/brasero-search.c                   |   10 +++++-----
 src/brasero-song-control.c             |    8 ++++----
 10 files changed, 34 insertions(+), 53 deletions(-)
---
diff --git a/libbrasero-burn/brasero-burn-dialog.c b/libbrasero-burn/brasero-burn-dialog.c
index d9e156d..4e8de0c 100644
--- a/libbrasero-burn/brasero-burn-dialog.c
+++ b/libbrasero-burn/brasero-burn-dialog.c
@@ -2614,7 +2614,7 @@ brasero_burn_dialog_init (BraseroBurnDialog * obj)
 }
 
 static void
-brasero_burn_dialog_destroy (GtkObject * object)
+brasero_burn_dialog_destroy (GtkWidget * object)
 {
 	BraseroBurnDialogPrivate *priv;
 
@@ -2625,8 +2625,8 @@ brasero_burn_dialog_destroy (GtkObject * object)
 		priv->burn = NULL;
 	}
 
-	if (GTK_OBJECT_CLASS (brasero_burn_dialog_parent_class)->destroy)
-		GTK_OBJECT_CLASS (brasero_burn_dialog_parent_class)->destroy (object);
+	if (GTK_WIDGET_CLASS (brasero_burn_dialog_parent_class)->destroy)
+		GTK_WIDGET_CLASS (brasero_burn_dialog_parent_class)->destroy (object);
 }
 
 static void
@@ -2689,13 +2689,12 @@ static void
 brasero_burn_dialog_class_init (BraseroBurnDialogClass * klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
 	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
 	g_type_class_add_private (klass, sizeof (BraseroBurnDialogPrivate));
 
 	object_class->finalize = brasero_burn_dialog_finalize;
-	gtk_object_class->destroy = brasero_burn_dialog_destroy;
+	widget_class->destroy = brasero_burn_dialog_destroy;
 	widget_class->delete_event = brasero_burn_dialog_delete;
 }
 
diff --git a/libbrasero-utils/brasero-jacket-view.c b/libbrasero-utils/brasero-jacket-view.c
index e1840a1..30177cb 100644
--- a/libbrasero-utils/brasero-jacket-view.c
+++ b/libbrasero-utils/brasero-jacket-view.c
@@ -757,8 +757,8 @@ brasero_jacket_view_set_side (BraseroJacketView *self,
 
 	if (priv->side == BRASERO_JACKET_BACK) {
 		GtkTextBuffer *sides_buffer;
-		GtkObject *vadj;
-		GtkObject *hadj;
+		GObject *vadj;
+		GObject *hadj;
 
 		sides_buffer = GTK_TEXT_BUFFER (brasero_jacket_buffer_new ());
 		g_signal_connect (sides_buffer,
@@ -1471,8 +1471,8 @@ brasero_jacket_view_init (BraseroJacketView *object)
 {
 	BraseroJacketViewPrivate *priv;
 	GtkTextBuffer *buffer;
-	GtkObject *vadj;
-	GtkObject *hadj;
+	GObject *vadj;
+	GObject *hadj;
 
 	priv = BRASERO_JACKET_VIEW_PRIVATE (object);
 
diff --git a/src/brasero-app.c b/src/brasero-app.c
index 3413410..6777f0f 100644
--- a/src/brasero-app.c
+++ b/src/brasero-app.c
@@ -320,7 +320,7 @@ brasero_app_get_saved_contents (BraseroApp *app)
  **/
 
 static void
-brasero_app_toplevel_destroyed_cb (GtkObject *object,
+brasero_app_toplevel_destroyed_cb (GtkWidget *object,
 				   BraseroApp *app)
 {
 	BraseroAppPrivate *priv;
diff --git a/src/brasero-layout.c b/src/brasero-layout.c
index e21c2e5..ffaa019 100644
--- a/src/brasero-layout.c
+++ b/src/brasero-layout.c
@@ -985,7 +985,7 @@ brasero_layout_foreach_item_cb (GtkTreeModel *model,
 }
 
 static void
-brasero_layout_combo_destroy_cb (GtkObject *object,
+brasero_layout_combo_destroy_cb (GtkWidget *object,
                                  gpointer NULL_data)
 {
 	GtkTreeModel *model;
@@ -999,12 +999,6 @@ brasero_layout_combo_destroy_cb (GtkObject *object,
 }
 
 static void
-brasero_layout_destroy (GtkObject *object)
-{
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
 brasero_layout_finalize (GObject *object)
 {
 	BraseroLayout *cobj;
@@ -1019,7 +1013,6 @@ static void
 brasero_layout_class_init (BraseroLayoutClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
 	GtkWidgetClass *gtk_widget_class = GTK_WIDGET_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
@@ -1028,8 +1021,6 @@ brasero_layout_class_init (BraseroLayoutClass *klass)
 	gtk_widget_class->hide = brasero_layout_hide;
 	gtk_widget_class->show = brasero_layout_show;
 
-	gtk_object_class->destroy = brasero_layout_destroy;
-
 	brasero_layout_signals[SIDEPANE_SIGNAL] =
 	    g_signal_new ("sidepane", G_OBJECT_CLASS_TYPE (object_class),
 			  G_SIGNAL_ACTION | G_SIGNAL_RUN_FIRST,
diff --git a/src/brasero-player-bacon.c b/src/brasero-player-bacon.c
index 4a8c344..2b1842b 100644
--- a/src/brasero-player-bacon.c
+++ b/src/brasero-player-bacon.c
@@ -613,7 +613,7 @@ brasero_player_bacon_init (BraseroPlayerBacon *obj)
 }
 
 static void
-brasero_player_bacon_destroy (GtkObject *obj)
+brasero_player_bacon_destroy (GtkWidget *obj)
 {
 	BraseroPlayerBacon *cobj;
 
@@ -646,8 +646,8 @@ brasero_player_bacon_destroy (GtkObject *obj)
 		cobj->priv->uri = NULL;
 	}
 
-	if (GTK_OBJECT_CLASS (brasero_player_bacon_parent_class)->destroy)
-		GTK_OBJECT_CLASS (brasero_player_bacon_parent_class)->destroy (obj);
+	if (GTK_WIDGET_CLASS (brasero_player_bacon_parent_class)->destroy)
+		GTK_WIDGET_CLASS (brasero_player_bacon_parent_class)->destroy (obj);
 }
 
 static void
@@ -665,14 +665,13 @@ static void
 brasero_player_bacon_class_init (BraseroPlayerBaconClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
 	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
 	object_class->finalize = brasero_player_bacon_finalize;
 	object_class->set_property = brasero_player_bacon_set_property;
 	object_class->get_property = brasero_player_bacon_get_property;
-	gtk_object_class->destroy = brasero_player_bacon_destroy;
 
+	widget_class->destroy = brasero_player_bacon_destroy;
 	widget_class->expose_event = brasero_player_bacon_expose;
 	widget_class->realize = brasero_player_bacon_realize;
 	widget_class->unrealize = brasero_player_bacon_unrealize;
diff --git a/src/brasero-player.c b/src/brasero-player.c
index cdf5c54..c738539 100644
--- a/src/brasero-player.c
+++ b/src/brasero-player.c
@@ -681,7 +681,7 @@ brasero_player_state_changed_cb (BraseroPlayerBacon *bacon,
 }
 
 static void
-brasero_player_destroy (GtkObject *obj)
+brasero_player_destroy (GtkWidget *obj)
 {
 	BraseroPlayer *player;
 
@@ -716,8 +716,8 @@ brasero_player_destroy (GtkObject *obj)
 		player->priv->meta_task = 0;
 	}
 
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		GTK_OBJECT_CLASS (parent_class)->destroy (obj);
+	if (GTK_WIDGET_CLASS (parent_class)->destroy)
+		GTK_WIDGET_CLASS (parent_class)->destroy (obj);
 }
 
 static void
@@ -735,12 +735,12 @@ static void
 brasero_player_class_init (BraseroPlayerClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
 	object_class->finalize = brasero_player_finalize;
 
-	gtk_object_class->destroy = brasero_player_destroy;
+	widget_class->destroy = brasero_player_destroy;
 
 	brasero_player_signals [ERROR_SIGNAL] = 
 			g_signal_new ("error",
@@ -975,4 +975,5 @@ brasero_player_new ()
 	obj = BRASERO_PLAYER (g_object_new (BRASERO_TYPE_PLAYER, NULL));
 
 	return GTK_WIDGET (obj);
+
 }
diff --git a/src/brasero-playlist.c b/src/brasero-playlist.c
index 639a80e..cb0b450 100644
--- a/src/brasero-playlist.c
+++ b/src/brasero-playlist.c
@@ -840,7 +840,7 @@ brasero_playlist_init (BraseroPlaylist *obj)
 }
 
 static void
-brasero_playlist_destroy (GtkObject *object)
+brasero_playlist_destroy (GtkWidget *object)
 {
 	BraseroPlaylist *playlist = BRASERO_PLAYLIST (object);
 
@@ -863,8 +863,8 @@ brasero_playlist_destroy (GtkObject *object)
 		playlist->priv->parse_type = NULL;
 	}
 
-	if (GTK_OBJECT_CLASS (brasero_playlist_parent_class)->destroy)
-		GTK_OBJECT_CLASS (brasero_playlist_parent_class)->destroy (object);
+	if (GTK_WIDGET_CLASS (brasero_playlist_parent_class)->destroy)
+		GTK_WIDGET_CLASS (brasero_playlist_parent_class)->destroy (object);
 }
 
 static void
@@ -883,10 +883,10 @@ static void
 brasero_playlist_class_init (BraseroPlaylistClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
 	object_class->finalize = brasero_playlist_finalize;
-	gtkobject_class->destroy = brasero_playlist_destroy;
+	widget_class->destroy = brasero_playlist_destroy;
 }
 
 static void
diff --git a/src/brasero-search-entry.c b/src/brasero-search-entry.c
index 6ac0646..0f27653 100644
--- a/src/brasero-search-entry.c
+++ b/src/brasero-search-entry.c
@@ -43,7 +43,6 @@
 static void brasero_search_entry_class_init (BraseroSearchEntryClass *klass);
 static void brasero_search_entry_init (BraseroSearchEntry *sp);
 static void brasero_search_entry_finalize (GObject *object);
-static void brasero_search_entry_destroy (GtkObject *gtk_object);
 
 struct BraseroSearchEntryPrivate {
 	GtkWidget *button;
@@ -120,11 +119,9 @@ static void
 brasero_search_entry_class_init (BraseroSearchEntryClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
 	object_class->finalize = brasero_search_entry_finalize;
-	gtk_object_class->destroy = brasero_search_entry_destroy;
 
 	brasero_search_entry_signals[ACTIVATED_SIGNAL] =
 	    g_signal_new ("activated", G_OBJECT_CLASS_TYPE (object_class),
@@ -342,12 +339,6 @@ brasero_search_entry_init (BraseroSearchEntry *obj)
 }
 
 static void
-brasero_search_entry_destroy (GtkObject *gtk_object)
-{
-	GTK_OBJECT_CLASS (parent_class)->destroy (gtk_object);
-}
-
-static void
 brasero_search_entry_finalize (GObject *object)
 {
 	BraseroSearchEntry *cobj;
diff --git a/src/brasero-search.c b/src/brasero-search.c
index f8b5a2a..8a828da 100644
--- a/src/brasero-search.c
+++ b/src/brasero-search.c
@@ -1070,7 +1070,7 @@ brasero_search_init (BraseroSearch *obj)
 }
 
 static void
-brasero_search_destroy (GtkObject *object)
+brasero_search_destroy (GtkWidget *object)
 {
 	BraseroSearch *search;
 
@@ -1099,8 +1099,8 @@ brasero_search_destroy (GtkObject *object)
 		search->priv->engine = NULL;
 	}
 
-	if (GTK_OBJECT_CLASS (brasero_search_parent_class)->destroy)
-		GTK_OBJECT_CLASS (brasero_search_parent_class)->destroy (object);
+	if (GTK_WIDGET_CLASS (brasero_search_parent_class)->destroy)
+		GTK_WIDGET_CLASS (brasero_search_parent_class)->destroy (object);
 }
 
 static void
@@ -1132,10 +1132,10 @@ static void
 brasero_search_class_init (BraseroSearchClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
 	object_class->finalize = brasero_search_finalize;
-	gtkobject_class->destroy = brasero_search_destroy;
+	widget_class->destroy = brasero_search_destroy;
 }
 
 GtkWidget *
diff --git a/src/brasero-song-control.c b/src/brasero-song-control.c
index eb60d37..c7c9c0c 100644
--- a/src/brasero-song-control.c
+++ b/src/brasero-song-control.c
@@ -444,7 +444,7 @@ brasero_song_control_bus_messages (GstBus *bus,
 }
 
 static void
-brasero_song_control_destroy (GtkObject *obj)
+brasero_song_control_destroy (GtkWidget *obj)
 {
 	BraseroSongControlPrivate *priv;
 
@@ -475,7 +475,7 @@ brasero_song_control_destroy (GtkObject *obj)
 		priv->uri = NULL;
 	}
 
-	GTK_OBJECT_CLASS (brasero_song_control_parent_class)->destroy (obj);
+	GTK_WIDGET_CLASS (brasero_song_control_parent_class)->destroy (obj);
 }
 
 static void
@@ -638,12 +638,12 @@ static void
 brasero_song_control_class_init (BraseroSongControlClass *klass)
 {
 	GObjectClass* object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass* gtk_object_class = GTK_OBJECT_CLASS (klass);
+	GtkWidgetClass* gtk_widget_class = GTK_WIDGET_CLASS (klass);
 
 	g_type_class_add_private (klass, sizeof (BraseroSongControlPrivate));
 
 	object_class->finalize = brasero_song_control_finalize;
-	gtk_object_class->destroy = brasero_song_control_destroy;
+	gtk_widget_class->destroy = brasero_song_control_destroy;
 }
 
 GtkWidget *
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]