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/evolution-wizard.c | 49 ++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) (limited to 'shell/evolution-wizard.c') diff --git a/shell/evolution-wizard.c b/shell/evolution-wizard.c index 9b036e517a..3a6dd2242b 100644 --- a/shell/evolution-wizard.c +++ b/shell/evolution-wizard.c @@ -1,7 +1,22 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ /* * evolution-wizard.c * - * Copyright (C) 2001 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 + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. * * Authors: Iain Holmes */ @@ -110,33 +125,27 @@ impl_GNOME_Evolution_Wizard_notifyAction (PortableServer_Servant servant, switch (action) { case GNOME_Evolution_Wizard_NEXT: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[NEXT], - pagenumber); + g_signal_emit (bonobo_object, signals[NEXT], 0, pagenumber); break; case GNOME_Evolution_Wizard_PREPARE: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[PREPARE], - pagenumber); + g_signal_emit (bonobo_object, signals[PREPARE], 0, pagenumber); break; case GNOME_Evolution_Wizard_BACK: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[BACK], - pagenumber); + g_signal_emit (bonobo_object, signals[BACK], 0, pagenumber); break; case GNOME_Evolution_Wizard_FINISH: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[FINISH], - pagenumber); + g_signal_emit (bonobo_object, signals[FINISH], 0, pagenumber); break; case GNOME_Evolution_Wizard_CANCEL: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[CANCEL], - pagenumber); + g_signal_emit (bonobo_object, signals[CANCEL], 0, pagenumber); break; case GNOME_Evolution_Wizard_HELP: - gtk_signal_emit (GTK_OBJECT (bonobo_object), signals[HELP], - pagenumber); + g_signal_emit (bonobo_object, signals[HELP], 0, pagenumber); break; default: @@ -146,29 +155,29 @@ impl_GNOME_Evolution_Wizard_notifyAction (PortableServer_Servant servant, static void -evolution_wizard_destroy (GtkObject *object) +impl_finalize (GObject *object) { EvolutionWizard *wizard; wizard = EVOLUTION_WIZARD (object); - if (wizard->priv == NULL) { + if (wizard->priv == NULL) return; - } g_free (wizard->priv); wizard->priv = NULL; - parent_class->destroy (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } + static void evolution_wizard_class_init (EvolutionWizardClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; POA_GNOME_Evolution_Wizard__epv *epv = &klass->epv; - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = evolution_wizard_destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = impl_finalize; signals[NEXT] = gtk_signal_new ("next", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), -- cgit v1.2.3