[gtk/abolish-destroy: 4/23] filechooserbutton: Use dispose instead of destroy
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/abolish-destroy: 4/23] filechooserbutton: Use dispose instead of destroy
- Date: Tue, 5 May 2020 21:01:12 +0000 (UTC)
commit 06f417505323b045b692f29aa8fd852353fbee78
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 5 16:48:11 2020 -0400
filechooserbutton: Use dispose instead of destroy
The destroy vfunc is going away.
gtk/gtkfilechooserbutton.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index f7c522d428..130276ed3a 100644
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -254,6 +254,7 @@ static gboolean gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser
/* GObject Functions */
static void gtk_file_chooser_button_constructed (GObject *object);
+static void gtk_file_chooser_button_dispose (GObject *object);
static void gtk_file_chooser_button_set_property (GObject *object,
guint param_id,
const GValue *value,
@@ -265,7 +266,6 @@ static void gtk_file_chooser_button_get_property (GObject *ob
static void gtk_file_chooser_button_finalize (GObject *object);
/* GtkWidget Functions */
-static void gtk_file_chooser_button_destroy (GtkWidget *widget);
static void gtk_file_chooser_button_show (GtkWidget *widget);
static void gtk_file_chooser_button_hide (GtkWidget *widget);
static void gtk_file_chooser_button_root (GtkWidget *widget);
@@ -460,8 +460,8 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class)
gobject_class->set_property = gtk_file_chooser_button_set_property;
gobject_class->get_property = gtk_file_chooser_button_get_property;
gobject_class->finalize = gtk_file_chooser_button_finalize;
+ gobject_class->dispose = gtk_file_chooser_button_dispose;
- widget_class->destroy = gtk_file_chooser_button_destroy;
widget_class->show = gtk_file_chooser_button_show;
widget_class->hide = gtk_file_chooser_button_hide;
widget_class->map = gtk_file_chooser_button_map;
@@ -1083,9 +1083,9 @@ gtk_file_chooser_button_state_flags_changed (GtkWidget *widget,
}
static void
-gtk_file_chooser_button_destroy (GtkWidget *widget)
+gtk_file_chooser_button_dispose (GObject *object)
{
- GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget);
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (object);
GSList *l;
if (button->model)
@@ -1126,7 +1126,7 @@ gtk_file_chooser_button_destroy (GtkWidget *widget)
g_clear_pointer (&button->bookmarks_manager, _gtk_bookmarks_manager_free);
- GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->destroy (widget);
+ G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->dispose (object);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]