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/evolution-shell-view.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/evolution-shell-view.c')
-rw-r--r-- | shell/evolution-shell-view.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c index fc700876e4..340a9b04d3 100644 --- a/shell/evolution-shell-view.c +++ b/shell/evolution-shell-view.c @@ -1,7 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* evolution-shell-view.c * - * Copyright (C) 2000 Ximian, Inc. + * Copyright (C) 2000, 2001, 2002 Ximian, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -61,7 +61,7 @@ impl_ShellView_set_message (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_MESSAGE], message, busy); + g_signal_emit (bonobo_object, signals[SET_MESSAGE], 0, message, busy); } static void @@ -71,7 +71,7 @@ impl_ShellView_unset_message (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[UNSET_MESSAGE]); + g_signal_emit (bonobo_object, signals[UNSET_MESSAGE], 0); } static void @@ -82,8 +82,7 @@ impl_ShellView_change_current_view (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[CHANGE_VIEW], - uri); + g_signal_emit (GTK_OBJECT (bonobo_object), signals[CHANGE_VIEW], 0, uri); } static void @@ -94,8 +93,7 @@ impl_ShellView_set_title (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_TITLE], - title); + g_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_TITLE], 0, title); } static void @@ -106,8 +104,7 @@ impl_ShellView_set_folder_bar_label (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_FOLDER_BAR_LABEL], - text); + g_signal_emit (GTK_OBJECT (bonobo_object), signals[SET_FOLDER_BAR_LABEL], 0, text); } static void @@ -117,13 +114,13 @@ impl_ShellView_show_settings (PortableServer_Servant servant, BonoboObject *bonobo_object; bonobo_object = bonobo_object_from_servant (servant); - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[SHOW_SETTINGS]); + g_signal_emit (GTK_OBJECT (bonobo_object), signals[SHOW_SETTINGS], 0); } -/* GtkObject methods. */ +/* GObject methods. */ static void -destroy (GtkObject *object) +impl_finalize (GObject *object) { EvolutionShellView *shell_view; EvolutionShellViewPrivate *priv; @@ -133,7 +130,7 @@ destroy (GtkObject *object) g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } @@ -141,10 +138,10 @@ static void class_init (EvolutionShellViewClass *klass) { POA_GNOME_Evolution_ShellView__epv *epv; - GtkObjectClass *object_class; + GObjectClass *object_class; - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = impl_finalize; epv = &klass->epv; epv->setMessage = impl_ShellView_set_message; |