[gedit] Adapt to GtkObject removal in GTK3

[Paolo Borelli <pborelli src gnome org>]

commit 2d1e134261b32887dda7e960d671bfac1efb8f37
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Sep 29 16:57:21 2010 +0200

    Adapt to GtkObject removal in GTK3
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=630972

 gedit/gedit-commands-search.c              |    4 +-
 gedit/gedit-history-entry.c                |   11 +++----
 gedit/gedit-overlay.c                      |   39 ++++++++++------------------
 gedit/gedit-view.c                         |   34 ++++++++++-------------
 plugins/spell/gedit-spell-checker-dialog.c |   10 +++----
 plugins/time/gedit-time-plugin.c           |    4 +-
 6 files changed, 42 insertions(+), 60 deletions(-)
---
diff --git a/gedit/gedit-commands-search.c b/gedit/gedit-commands-search.c
index 940903d..df59d5e 100644
--- a/gedit/gedit-commands-search.c
+++ b/gedit/gedit-commands-search.c
@@ -528,7 +528,7 @@ _gedit_cmd_search_find (GtkAction   *action,
 	/* incremental search is builtin in GeditView, just activate
 	 * the corresponding binding.
 	 */
-	gtk_bindings_activate (GTK_OBJECT (active_view),
+	gtk_bindings_activate (G_OBJECT (active_view),
 			       GDK_KEY_f,
 			       GDK_CONTROL_MASK);
 }
@@ -655,7 +655,7 @@ _gedit_cmd_search_goto_line (GtkAction   *action,
 	/* goto line is builtin in GeditView, just activate
 	 * the corresponding binding.
 	 */
-	gtk_bindings_activate (GTK_OBJECT (active_view),
+	gtk_bindings_activate (G_OBJECT (active_view),
 			       GDK_KEY_i,
 			       GDK_CONTROL_MASK);
 }
diff --git a/gedit/gedit-history-entry.c b/gedit/gedit-history-entry.c
index 200563d..237ce67 100644
--- a/gedit/gedit-history-entry.c
+++ b/gedit/gedit-history-entry.c
@@ -116,12 +116,12 @@ gedit_history_entry_get_property (GObject    *object,
 }
 
 static void
-gedit_history_entry_destroy (GtkObject *object)
+gedit_history_entry_dispose (GObject *object)
 {
 	gedit_history_entry_set_enable_completion (GEDIT_HISTORY_ENTRY (object),
 						   FALSE);
 
-	GTK_OBJECT_CLASS (gedit_history_entry_parent_class)->destroy (object);
+	G_OBJECT_CLASS (gedit_history_entry_parent_class)->dispose (object);
 }
 
 static void
@@ -146,13 +146,12 @@ static void
 gedit_history_entry_class_init (GeditHistoryEntryClass *klass)
 {
 	GObjectClass   *object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);
-	
+
 	object_class->set_property = gedit_history_entry_set_property;
 	object_class->get_property = gedit_history_entry_get_property;
+	object_class->dispose = gedit_history_entry_dispose;
 	object_class->finalize = gedit_history_entry_finalize;
-	gtkobject_class->destroy = gedit_history_entry_destroy;
-	
+
 	g_object_class_install_property (object_class,
 					 PROP_HISTORY_ID,
 					 g_param_spec_string ("history-id",
diff --git a/gedit/gedit-overlay.c b/gedit/gedit-overlay.c
index ba698c0..74c0c79 100644
--- a/gedit/gedit-overlay.c
+++ b/gedit/gedit-overlay.c
@@ -108,6 +108,20 @@ gedit_overlay_dispose (GObject *object)
 {
 	GeditOverlay *overlay = GEDIT_OVERLAY (object);
 
+	if (overlay->priv->hadjustment != NULL)
+	{
+		g_signal_handler_disconnect (overlay->priv->hadjustment,
+		                             overlay->priv->hadjustment_signal_id);
+		overlay->priv->hadjustment = NULL;
+	}
+
+	if (overlay->priv->vadjustment != NULL)
+	{
+		g_signal_handler_disconnect (overlay->priv->vadjustment,
+		                             overlay->priv->vadjustment_signal_id);
+		overlay->priv->vadjustment = NULL;
+	}
+
 	if (overlay->priv->stage != NULL)
 	{
 		g_object_unref (overlay->priv->stage);
@@ -161,28 +175,6 @@ gedit_overlay_set_property (GObject      *object,
 }
 
 static void
-gedit_overlay_destroy (GtkObject *object)
-{
-	GeditOverlay *overlay = GEDIT_OVERLAY (object);
-
-	if (overlay->priv->hadjustment != NULL)
-	{
-		g_signal_handler_disconnect (overlay->priv->hadjustment,
-		                             overlay->priv->hadjustment_signal_id);
-		overlay->priv->hadjustment = NULL;
-	}
-
-	if (overlay->priv->vadjustment != NULL)
-	{
-		g_signal_handler_disconnect (overlay->priv->vadjustment,
-		                             overlay->priv->vadjustment_signal_id);
-		overlay->priv->vadjustment = NULL;
-	}
-
-	GTK_OBJECT_CLASS (gedit_overlay_parent_class)->destroy (object);
-}
-
-static void
 gedit_overlay_realize (GtkWidget *widget)
 {
 	GtkAllocation allocation;
@@ -385,7 +377,6 @@ static void
 gedit_overlay_class_init (GeditOverlayClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass *gtkobject_class = GTK_OBJECT_CLASS (klass);
 	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 	GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
 
@@ -394,8 +385,6 @@ gedit_overlay_class_init (GeditOverlayClass *klass)
 	object_class->get_property = gedit_overlay_get_property;
 	object_class->set_property = gedit_overlay_set_property;
 
-	gtkobject_class->destroy = gedit_overlay_destroy;
-
 	widget_class->realize = gedit_overlay_realize;
 	widget_class->size_allocate = gedit_overlay_size_allocate;
 
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index ae5df7d..f8725a9 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -68,16 +68,14 @@ enum
 
 struct _GeditViewPrivate
 {
-	GSettings   *editor_settings;
-	
+	GSettings *editor_settings;
 	GtkTextBuffer *current_buffer;
-
 	PeasExtensionSet *extensions;
 };
 
-static void	gedit_view_destroy		(GtkObject        *object);
 static void	gedit_view_finalize		(GObject          *object);
-static gint     gedit_view_focus_out		(GtkWidget        *widget,
+static void	gedit_view_destroy		(GtkWidget        *widget);
+static gint	gedit_view_focus_out		(GtkWidget        *widget,
 						 GdkEventFocus    *event);
 static gboolean gedit_view_drag_motion		(GtkWidget        *widget,
 						 GdkDragContext   *context,
@@ -143,18 +141,16 @@ static void
 gedit_view_class_init (GeditViewClass *klass)
 {
 	GObjectClass     *object_class = G_OBJECT_CLASS (klass);
-	GtkObjectClass   *gtkobject_class = GTK_OBJECT_CLASS (klass);
 	GtkWidgetClass   *widget_class = GTK_WIDGET_CLASS (klass);
 	GtkTextViewClass *text_view_class = GTK_TEXT_VIEW_CLASS (klass);
-	
 	GtkBindingSet    *binding_set;
 
-	gtkobject_class->destroy = gedit_view_destroy;
 	object_class->finalize = gedit_view_finalize;
 
+	widget_class->destroy = gedit_view_destroy;
 	widget_class->focus_out_event = gedit_view_focus_out;
 	widget_class->expose_event = gedit_view_expose;
-	
+
 	/*
 	 * Override the gtk_text_view_drag_motion and drag_drop
 	 * functions to get URIs
@@ -421,11 +417,11 @@ gedit_view_init (GeditView *view)
 }
 
 static void
-gedit_view_destroy (GtkObject *object)
+gedit_view_destroy (GtkWidget *widget)
 {
 	GeditView *view;
 
-	view = GEDIT_VIEW (object);
+	view = GEDIT_VIEW (widget);
 
 	if (view->priv->extensions != NULL)
 	{
@@ -439,14 +435,14 @@ gedit_view_destroy (GtkObject *object)
 	   would reinstate a GtkTextBuffer which we don't want */
 	current_buffer_removed (view);
 	g_signal_handlers_disconnect_by_func (view, on_notify_buffer_cb, NULL);
-	
+
 	if (view->priv->editor_settings != NULL)
 	{
 		g_object_unref (view->priv->editor_settings);
 		view->priv->editor_settings = NULL;
 	}
 
-	(* GTK_OBJECT_CLASS (gedit_view_parent_class)->destroy) (object);
+	GTK_WIDGET_CLASS (gedit_view_parent_class)->destroy (widget);
 }
 
 static void
@@ -458,7 +454,7 @@ gedit_view_finalize (GObject *object)
 
 	current_buffer_removed (view);
 
-	(* G_OBJECT_CLASS (gedit_view_parent_class)->finalize) (object);
+	G_OBJECT_CLASS (gedit_view_parent_class)->finalize (object);
 }
 
 static gint
@@ -466,7 +462,7 @@ gedit_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
 {
 	gtk_widget_queue_draw (widget);
 
-	(* GTK_WIDGET_CLASS (gedit_view_parent_class)->focus_out_event) (widget, event);
+	GTK_WIDGET_CLASS (gedit_view_parent_class)->focus_out_event (widget, event);
 
 	return FALSE;
 }
@@ -726,11 +722,11 @@ gedit_view_expose (GtkWidget      *widget,
 {
 	GtkTextView *text_view;
 	GeditDocument *doc;
-	
+
 	text_view = GTK_TEXT_VIEW (widget);
-	
+
 	doc = GEDIT_DOCUMENT (gtk_text_view_get_buffer (text_view));
-	
+
 	if ((event->window == gtk_text_view_get_window (text_view, GTK_TEXT_WINDOW_TEXT)) &&
 	    gedit_document_get_enable_search_highlighting (doc))
 	{
@@ -750,7 +746,7 @@ gedit_view_expose (GtkWidget      *widget,
 					       &iter2);
 	}
 
-	return (* GTK_WIDGET_CLASS (gedit_view_parent_class)->expose_event)(widget, event);
+	return GTK_WIDGET_CLASS (gedit_view_parent_class)->expose_event (widget, event);
 }
 
 static GdkAtom
diff --git a/plugins/spell/gedit-spell-checker-dialog.c b/plugins/spell/gedit-spell-checker-dialog.c
index 10ae585..7eaed42 100644
--- a/plugins/spell/gedit-spell-checker-dialog.c
+++ b/plugins/spell/gedit-spell-checker-dialog.c
@@ -112,7 +112,7 @@ static guint signals [LAST_SIGNAL] = { 0 };
 G_DEFINE_TYPE(GeditSpellCheckerDialog, gedit_spell_checker_dialog, GTK_TYPE_WINDOW)
 
 static void
-gedit_spell_checker_dialog_destroy (GtkObject *object)
+gedit_spell_checker_dialog_dispose (GObject *object)
 {
 	GeditSpellCheckerDialog *dlg = GEDIT_SPELL_CHECKER_DIALOG (object);
 
@@ -128,17 +128,15 @@ gedit_spell_checker_dialog_destroy (GtkObject *object)
 		dlg->misspelled_word = NULL;
 	}
 
-	GTK_OBJECT_CLASS (gedit_spell_checker_dialog_parent_class)->destroy (object);
+	G_OBJECT_CLASS (gedit_spell_checker_dialog_parent_class)->dipose (object);
 }
 
 static void
 gedit_spell_checker_dialog_class_init (GeditSpellCheckerDialogClass * klass)
 {
-	GObjectClass *object_class;
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class = G_OBJECT_CLASS (klass);
-
-	GTK_OBJECT_CLASS (object_class)->destroy = gedit_spell_checker_dialog_destroy;
+	object_class->dispose = gedit_spell_checker_dialog_dispose;
 
 	signals[IGNORE] = 
 		g_signal_new ("ignore",
diff --git a/plugins/time/gedit-time-plugin.c b/plugins/time/gedit-time-plugin.c
index a7c600e..cdc4000 100644
--- a/plugins/time/gedit-time-plugin.c
+++ b/plugins/time/gedit-time-plugin.c
@@ -422,7 +422,7 @@ get_time (const gchar* format)
 }
 
 static void
-configure_widget_destroyed (GtkObject *obj,
+configure_widget_destroyed (GtkWidget *widget,
 			    gpointer   data)
 {
 	TimeConfigureWidget *widget = (TimeConfigureWidget *)data;
@@ -436,7 +436,7 @@ configure_widget_destroyed (GtkObject *obj,
 }
 
 static void
-choose_format_dialog_destroyed (GtkObject *obj,
+choose_format_dialog_destroyed (GtkWidget *widget,
 				gpointer   dialog_pointer)
 {
 	gedit_debug (DEBUG_PLUGINS);