diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-04 06:08:16 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-04 06:08:16 +0800 |
commit | ede7fcb220b739c4d12775904086afe0df595acd (patch) | |
tree | cae8198cf8f57d3e08d13c03538e69a411f8a45c /shell/e-activity-handler.c | |
parent | 9cbba714fc0eb122c0736b94727b4d2580b9d53c (diff) | |
download | gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.gz gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.zst gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.zip |
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
Diffstat (limited to 'shell/e-activity-handler.c')
-rw-r--r-- | shell/e-activity-handler.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/shell/e-activity-handler.c b/shell/e-activity-handler.c index efddecdb3c..e0002af2df 100644 --- a/shell/e-activity-handler.c +++ b/shell/e-activity-handler.c @@ -282,8 +282,9 @@ task_widget_new_from_activity_info (ActivityInfo *activity_info) activity_info->information); gtk_widget_show (widget); - gtk_signal_connect (GTK_OBJECT (widget), "button_press_event", - GTK_SIGNAL_FUNC (task_widget_button_press_event_callback), activity_info); + g_signal_connect (widget, "button_press_event", + G_CALLBACK (task_widget_button_press_event_callback), + activity_info); return E_TASK_WIDGET (widget); } @@ -323,10 +324,10 @@ task_bar_destroy_callback (GtkObject *task_bar_object, } -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_finalize (GObject *object) { EActivityHandler *handler; EActivityHandlerPrivate *priv; @@ -345,7 +346,7 @@ impl_destroy (GtkObject *object) g_free (priv); handler->priv = NULL; - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -509,13 +510,13 @@ impl_requestDialog (PortableServer_Servant servant, /* GTK+ type stuff. */ static void -class_init (GtkObjectClass *object_class) +class_init (GObjectClass *object_class) { EActivityHandlerClass *handler_class; parent_class = gtk_type_class (PARENT_TYPE); - object_class->destroy = impl_destroy; + object_class->finalize = impl_finalize; handler_class = E_ACTIVITY_HANDLER_CLASS (object_class); handler_class->epv.operationStarted = impl_operationStarted; @@ -552,7 +553,7 @@ e_activity_handler_new (void) { EActivityHandler *activity_handler; - activity_handler = gtk_type_new (e_activity_handler_get_type ()); + activity_handler = g_object_new (e_activity_handler_get_type (), 0); e_activity_handler_construct (activity_handler); return activity_handler; @@ -572,9 +573,9 @@ e_activity_handler_attach_task_bar (EActivityHandler *activity_handler, priv = activity_handler->priv; - gtk_signal_connect_while_alive (GTK_OBJECT (task_bar), "destroy", - GTK_SIGNAL_FUNC (task_bar_destroy_callback), activity_handler, - GTK_OBJECT (activity_handler)); + g_signal_connect_object (task_bar, "destroy", + G_CALLBACK (task_bar_destroy_callback), + G_OBJECT (activity_handler), 0); priv->task_bars = g_slist_prepend (priv->task_bars, task_bar); |