From 1c6f2d154e74f908e2c4a137de0233b5faf4f6b6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 6 Oct 2010 19:26:08 +0200 Subject: Bug #631320 - GtkObject is gone in GTK3 --- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 2 +- addressbook/gui/widgets/e-addressbook-view.c | 4 ++-- addressbook/gui/widgets/e-minicard.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'addressbook') diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 928d9aa023..236ccbb127 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -479,7 +479,7 @@ e_addressbook_reflow_adapter_class_init (GObjectClass *object_class) } static void -e_addressbook_reflow_adapter_init (GtkObject *object) +e_addressbook_reflow_adapter_init (GObject *object) { EAddressbookReflowAdapter *adapter = E_ADDRESSBOOK_REFLOW_ADAPTER (object); EAddressbookReflowAdapterPrivate *priv; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 957d85e30f..5d54f28686 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -73,7 +73,7 @@ static void search_result (EAddressbookView *view, const gchar *error_msg); static void folder_bar_message (EAddressbookView *view, const gchar *status); -static void stop_state_changed (GtkObject *object, +static void stop_state_changed (GObject *object, EAddressbookView *view); static void backend_died (EAddressbookView *view); static void command_state_change (EAddressbookView *view); @@ -1124,7 +1124,7 @@ folder_bar_message (EAddressbookView *view, } static void -stop_state_changed (GtkObject *object, EAddressbookView *view) +stop_state_changed (GObject *object, EAddressbookView *view) { command_state_change (view); } diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 5c2da9de01..e3dc55bb70 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -69,7 +69,7 @@ static gpointer parent_class; static void e_minicard_field_destroy (EMinicardField *field) { - gtk_object_destroy (GTK_OBJECT (field->label)); + g_object_run_dispose (G_OBJECT (field->label)); g_free (field); } -- cgit