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-model.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'shell/e-shortcuts-view-model.c') diff --git a/shell/e-shortcuts-view-model.c b/shell/e-shortcuts-view-model.c index ddfa12f805..86ff02158a 100644 --- a/shell/e-shortcuts-view-model.c +++ b/shell/e-shortcuts-view-model.c @@ -315,24 +315,12 @@ e_shortcuts_view_model_construct (EShortcutsViewModel *model, load_all_shortcuts_into_model (model); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "new_group", GTK_SIGNAL_FUNC (shortcuts_new_group_cb), model, - GTK_OBJECT (model)); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "remove_group", GTK_SIGNAL_FUNC (shortcuts_remove_group_cb), model, - GTK_OBJECT (model)); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "rename_group", GTK_SIGNAL_FUNC (shortcuts_rename_group_cb), model, - GTK_OBJECT (model)); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "new_shortcut", GTK_SIGNAL_FUNC (shortcuts_new_shortcut_cb), model, - GTK_OBJECT (model)); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "remove_shortcut", GTK_SIGNAL_FUNC (shortcuts_remove_shortcut_cb), model, - GTK_OBJECT (model)); - gtk_signal_connect_while_alive (GTK_OBJECT (priv->shortcuts), - "update_shortcut", GTK_SIGNAL_FUNC (shortcuts_update_shortcut_cb), model, - GTK_OBJECT (model)); + g_signal_connect_object (priv->shortcuts, "new_group", G_CALLBACK (shortcuts_new_group_cb), model, 0); + g_signal_connect_object (priv->shortcuts, "remove_group", G_CALLBACK (shortcuts_remove_group_cb), model, 0); + g_signal_connect_object (priv->shortcuts, "rename_group", G_CALLBACK (shortcuts_rename_group_cb), model, 0); + g_signal_connect_object (priv->shortcuts, "new_shortcut", G_CALLBACK (shortcuts_new_shortcut_cb), model, 0); + g_signal_connect_object (priv->shortcuts, "remove_shortcut", G_CALLBACK (shortcuts_remove_shortcut_cb), model, 0); + g_signal_connect_object (priv->shortcuts, "update_shortcut", G_CALLBACK (shortcuts_update_shortcut_cb), model, 0); } EShortcutsViewModel * -- cgit v1.2.3