[Xfce4-commits] [apps/gigolo] 06/35: Migrate from GtkObject to GObject

noreply at xfce.org noreply at xfce.org
Mon Oct 31 18:18:40 CET 2016


This is an automated email from the git hooks/post-receive script.

landry pushed a commit to branch master
in repository apps/gigolo.

commit a0b850a4deae5e60c2bf55381df285e8aac290fb
Author: Landry Breuil <landry at xfce.org>
Date:   Fri Jun 17 22:45:34 2016 +0200

    Migrate from GtkObject to GObject
---
 src/bookmarkeditdialog.c |  7 +++----
 src/mountdialog.c        | 10 +++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index d45a80e..4de244c 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -160,7 +160,7 @@ G_DEFINE_TYPE(GigoloBookmarkEditDialog, gigolo_bookmark_edit_dialog, GTK_TYPE_DI
 
 
 
-static void gigolo_bookmark_edit_dialog_destroy(GtkObject *object)
+static void gigolo_bookmark_edit_dialog_finalize(GObject *object)
 {
 	GigoloBookmarkEditDialogPrivate *priv = GIGOLO_BOOKMARK_EDIT_DIALOG_GET_PRIVATE(object);
 	GigoloBackendGVFS *backend;
@@ -189,7 +189,7 @@ static void gigolo_bookmark_edit_dialog_destroy(GtkObject *object)
 	gtk_widget_destroy(priv->share_label);
 	gtk_widget_destroy(priv->information_label);
 
-	GTK_OBJECT_CLASS(gigolo_bookmark_edit_dialog_parent_class)->destroy(object);
+	G_OBJECT_CLASS(gigolo_bookmark_edit_dialog_parent_class)->finalize(object);
 }
 
 
@@ -319,10 +319,9 @@ gint gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
 
 static void gigolo_bookmark_edit_dialog_class_init(GigoloBookmarkEditDialogClass *klass)
 {
-	GtkObjectClass *gtk_object_class = (GtkObjectClass *) klass;
 	GObjectClass *g_object_class = G_OBJECT_CLASS(klass);
 
-	gtk_object_class->destroy = gigolo_bookmark_edit_dialog_destroy;
+	g_object_class->finalize = gigolo_bookmark_edit_dialog_finalize;
 
 	g_object_class->set_property = gigolo_bookmark_edit_dialog_set_property;
 
diff --git a/src/mountdialog.c b/src/mountdialog.c
index c204ca7..250f428 100644
--- a/src/mountdialog.c
+++ b/src/mountdialog.c
@@ -49,7 +49,7 @@ struct _GigoloMountDialogPrivate
 	guint timer_id;
 };
 
-static void gigolo_mount_dialog_destroy				(GtkObject *widget);
+static void gigolo_mount_dialog_finalize			(GObject *widget);
 
 
 G_DEFINE_TYPE(GigoloMountDialog, gigolo_mount_dialog, GTK_TYPE_DIALOG);
@@ -58,15 +58,15 @@ G_DEFINE_TYPE(GigoloMountDialog, gigolo_mount_dialog, GTK_TYPE_DIALOG);
 
 static void gigolo_mount_dialog_class_init(GigoloMountDialogClass *klass)
 {
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
+	GObjectClass *object_class = G_OBJECT_CLASS(klass);
 
-	object_class->destroy = gigolo_mount_dialog_destroy;
+	object_class->finalize = gigolo_mount_dialog_finalize;
 
 	g_type_class_add_private(klass, sizeof(GigoloMountDialogPrivate));
 }
 
 
-static void gigolo_mount_dialog_destroy(GtkObject *widget)
+static void gigolo_mount_dialog_finalize(GObject *widget)
 {
 	GigoloMountDialogPrivate *priv = GIGOLO_MOUNT_DIALOG_GET_PRIVATE(widget);
 
@@ -76,7 +76,7 @@ static void gigolo_mount_dialog_destroy(GtkObject *widget)
 		priv->timer_id = -1;
 	}
 
-	GTK_OBJECT_CLASS(gigolo_mount_dialog_parent_class)->destroy(widget);
+	G_OBJECT_CLASS(gigolo_mount_dialog_parent_class)->finalize(widget);
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list