From ede7fcb220b739c4d12775904086afe0df595acd Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sun, 3 Nov 2002 22:08:16 +0000 Subject: Changed all gtk_object_refs()/gtk_object_unrefs() into * *.c, *.h: Changed all gtk_object_refs()/gtk_object_unrefs() into g_object_refs()/g_object_unrefs() and all gtk_signal_connect_*() into g_signal_connect_*(). [Except for some case where we have gtk_signal_connect_full() or gtk_signal_connect_while_alive() calls that cannot be trivially ported to use the g_signal_* functions, we'll have to fix those later.] * e-splash.c (impl_finalize): Finalize implementation, copied over from impl_destroy. (impl_destroy): Removed. (class_init): Override finalize, not destroy. * e-activity-handler.c: Ported from GtkObject to GObject. * evolution-storage.c: Likewise. * e-corba-shortcuts.c: Likewise. * evolution-session.h: Likewise. * evolution-config-control.c: Likewise. * evolution-shell-component-dnd.c: Likewise. * evolution-shell-component.c: Likewise. * evolution-shell-view.c: Likewise. * evolution-storage-set-view.c: Likewise. * evolution-wizard.c: Likewise. svn path=/trunk/; revision=18513 --- shell/e-shortcuts-view.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'shell/e-shortcuts-view.c') diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c index 51961afae6..779a5c55be 100644 --- a/shell/e-shortcuts-view.c +++ b/shell/e-shortcuts-view.c @@ -475,7 +475,7 @@ destroy (GtkObject *object) priv = shortcuts_view->priv; - gtk_object_unref (GTK_OBJECT (priv->shortcuts)); + g_object_unref (priv->shortcuts); g_free (priv); @@ -738,14 +738,13 @@ e_shortcuts_view_construct (EShortcutsView *shortcuts_view, priv = shortcuts_view->priv; priv->shortcuts = shortcuts; - gtk_object_ref (GTK_OBJECT (priv->shortcuts)); + g_object_ref (priv->shortcuts); e_shortcut_bar_set_model (E_SHORTCUT_BAR (shortcuts_view), E_SHORTCUT_MODEL (e_shortcuts_view_model_new (shortcuts))); - gtk_signal_connect_while_alive (GTK_OBJECT (shortcuts), "group_change_icon_size", - GTK_SIGNAL_FUNC (group_change_icon_size_callback), - shortcuts_view, GTK_OBJECT (shortcuts_view)); + g_signal_connect_object (shortcuts, "group_change_icon_size", + G_CALLBACK (group_change_icon_size_callback), shortcuts_view, 0); num_groups = e_shortcuts_get_num_groups (shortcuts); for (i = 0; i < num_groups; i ++) { -- cgit