From 4fe815f4dc825928008a1fc09e53ebcbbc22569d Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Tue, 30 Oct 2012 23:31:43 +0200 Subject: [eel-stock-dialogs] don't use GtkObject http://git.gnome.org/browse/nautilus/commit/?id=5edcd42e503623c11bf55c6afba437b3013c7f45 --- eel/eel-stock-dialogs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c index 6cf48f02..7f83476e 100644 --- a/eel/eel-stock-dialogs.c +++ b/eel/eel-stock-dialogs.c @@ -60,7 +60,7 @@ typedef struct static GHashTable *timed_wait_hash_table; -static void timed_wait_dialog_destroy_callback (GtkObject *object, gpointer callback_data); +static void timed_wait_dialog_destroy_callback (GtkWidget *object, gpointer callback_data); static guint timed_wait_hash (gconstpointer value) @@ -86,7 +86,7 @@ timed_wait_hash_equal (gconstpointer value1, gconstpointer value2) } static void -timed_wait_delayed_close_destroy_dialog_callback (GtkObject *object, gpointer callback_data) +timed_wait_delayed_close_destroy_dialog_callback (GtkWidget *object, gpointer callback_data) { g_source_remove (GPOINTER_TO_UINT (callback_data)); } @@ -103,7 +103,7 @@ timed_wait_delayed_close_timeout_callback (gpointer callback_data) G_CALLBACK (timed_wait_delayed_close_destroy_dialog_callback), GUINT_TO_POINTER (handler_id)); - gtk_object_destroy (GTK_OBJECT (callback_data)); + gtk_widget_destroy (GTK_WIDGET (callback_data)); return FALSE; } @@ -153,7 +153,7 @@ timed_wait_free (TimedWait *wait) } else { - gtk_object_destroy (GTK_OBJECT (wait->dialog)); + gtk_widget_destroy (GTK_WIDGET (wait->dialog)); } } @@ -162,7 +162,7 @@ timed_wait_free (TimedWait *wait) } static void -timed_wait_dialog_destroy_callback (GtkObject *object, gpointer callback_data) +timed_wait_dialog_destroy_callback (GtkWidget *object, gpointer callback_data) { TimedWait *wait; @@ -424,7 +424,7 @@ show_message_dialog (const char *primary_text, gtk_widget_show (GTK_WIDGET (dialog)); g_signal_connect (dialog, "response", - G_CALLBACK (gtk_object_destroy), NULL); + G_CALLBACK (gtk_widget_destroy), NULL); return dialog; } -- cgit v1.2.1