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-corba-shortcuts.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-corba-shortcuts.c')
-rw-r--r-- | shell/e-corba-shortcuts.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/shell/e-corba-shortcuts.c b/shell/e-corba-shortcuts.c index 06f68144d0..6412d9e69d 100644 --- a/shell/e-corba-shortcuts.c +++ b/shell/e-corba-shortcuts.c @@ -84,10 +84,10 @@ shortcut_list_to_corba (const GSList *shortcut_list, } -/* GtkObject methods. */ +/* GObject methods. */ static void -impl_destroy (GtkObject *object) +impl_finalize (GObject *object) { ECorbaShortcuts *corba_shortcuts; ECorbaShortcutsPrivate *priv; @@ -95,14 +95,16 @@ impl_destroy (GtkObject *object) corba_shortcuts = E_CORBA_SHORTCUTS (object); priv = corba_shortcuts->priv; - gtk_object_unref (GTK_OBJECT (priv->shortcuts)); + g_object_unref (priv->shortcuts); g_free (priv); - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); + (* G_OBJECT_CLASS (parent_class)->finalize) (object); } +/* Evolution::Shortcuts CORBA methods. */ + static void impl_add (PortableServer_Servant servant, const CORBA_short group_num, @@ -277,14 +279,14 @@ impl__get_groups (PortableServer_Servant servant, static void -class_init (GtkObjectClass *object_class) +class_init (GObjectClass *object_class) { ECorbaShortcutsClass *corba_shortcuts_class; POA_GNOME_Evolution_Shortcuts__epv *epv; parent_class = gtk_type_class (PARENT_TYPE); - object_class->destroy = impl_destroy; + object_class->finalize = impl_finalize; corba_shortcuts_class = E_CORBA_SHORTCUTS_CLASS (object_class); @@ -318,9 +320,9 @@ e_corba_shortcuts_new (EShortcuts *shortcuts) g_return_val_if_fail (shortcuts != NULL, NULL); g_return_val_if_fail (E_IS_SHORTCUTS (shortcuts), NULL); - corba_shortcuts = gtk_type_new (e_corba_shortcuts_get_type ()); + corba_shortcuts = g_object_new (e_corba_shortcuts_get_type (), NULL); - gtk_object_ref (GTK_OBJECT (shortcuts)); + g_object_ref (shortcuts); corba_shortcuts->priv->shortcuts = shortcuts; return corba_shortcuts; |