[gtk/wip/baedert/for-master: 48/74] printunixdialog: Stop implementing destroy()



commit 7d23ad1c82448ef660f0035c572261e452a7235d
Author: Timm Bäder <mail baedert org>
Date:   Wed Oct 2 12:50:52 2019 +0200

    printunixdialog: Stop implementing destroy()

 gtk/gtkprintunixdialog.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index d2d516c569..432cc57a11 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -125,7 +125,7 @@
 
 
 static void     gtk_print_unix_dialog_constructed  (GObject            *object);
-static void     gtk_print_unix_dialog_destroy      (GtkWidget          *widget);
+static void     gtk_print_unix_dialog_dispose      (GObject            *object);
 static void     gtk_print_unix_dialog_finalize     (GObject            *object);
 static void     gtk_print_unix_dialog_set_property (GObject            *object,
                                                     guint               prop_id,
@@ -418,12 +418,11 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
   widget_class = (GtkWidgetClass *) class;
 
   object_class->constructed = gtk_print_unix_dialog_constructed;
+  object_class->dispose = gtk_print_unix_dialog_dispose;
   object_class->finalize = gtk_print_unix_dialog_finalize;
   object_class->set_property = gtk_print_unix_dialog_set_property;
   object_class->get_property = gtk_print_unix_dialog_get_property;
 
-  widget_class->destroy = gtk_print_unix_dialog_destroy;
-
   g_object_class_install_property (object_class,
                                    PROP_PAGE_SETUP,
                                    g_param_spec_object ("page-setup",
@@ -837,14 +836,14 @@ gtk_print_unix_dialog_constructed (GObject *object)
 }
 
 static void
-gtk_print_unix_dialog_destroy (GtkWidget *widget)
+gtk_print_unix_dialog_dispose (GObject *object)
 {
-  GtkPrintUnixDialog *dialog = GTK_PRINT_UNIX_DIALOG (widget);
+  GtkPrintUnixDialog *dialog = GTK_PRINT_UNIX_DIALOG (object);
 
   /* Make sure we don't destroy custom widgets owned by the backends */
   clear_per_printer_ui (dialog);
 
-  GTK_WIDGET_CLASS (gtk_print_unix_dialog_parent_class)->destroy (widget);
+  G_OBJECT_CLASS (gtk_print_unix_dialog_parent_class)->dispose (object);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]