aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-splash.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-04 06:08:16 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-04 06:08:16 +0800
commitede7fcb220b739c4d12775904086afe0df595acd (patch)
treecae8198cf8f57d3e08d13c03538e69a411f8a45c /shell/e-splash.c
parent9cbba714fc0eb122c0736b94727b4d2580b9d53c (diff)
downloadgsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.gz
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.bz2
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.lz
gsoc2013-evolution-ede7fcb220b739c4d12775904086afe0df595acd.tar.xz
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-splash.c')
-rw-r--r--shell/e-splash.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/shell/e-splash.c b/shell/e-splash.c
index dc752deca4..cb75d35423 100644
--- a/shell/e-splash.c
+++ b/shell/e-splash.c
@@ -139,7 +139,8 @@ icon_free (Icon *icon)
{
gdk_pixbuf_unref (icon->dark_pixbuf);
gdk_pixbuf_unref (icon->light_pixbuf);
-/* gtk_object_unref (GTK_OBJECT (icon->canvas_item)); */
+
+/* g_object_unref (icon->canvas_item); */
g_free (icon);
}
@@ -206,10 +207,10 @@ schedule_relayout (ESplash *splash)
}
-/* GtkObject methods. */
+/* GObject methods. */
static void
-impl_destroy (GtkObject *object)
+impl_finalize (GObject *object)
{
ESplash *splash;
ESplashPrivate *priv;
@@ -235,17 +236,17 @@ impl_destroy (GtkObject *object)
g_free (priv);
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
class_init (ESplashClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
- object_class = GTK_OBJECT_CLASS (klass);
- object_class->destroy = impl_destroy;
+ object_class = G_OBJECT_CLASS (klass);
+ object_class->finalize = impl_finalize;
parent_class = gtk_type_class (gtk_window_get_type ());
}
@@ -325,8 +326,8 @@ e_splash_construct (ESplash *splash,
"pixbuf", splash_image_pixbuf,
NULL);
- gtk_signal_connect (GTK_OBJECT (splash), "button-press-event",
- GTK_SIGNAL_FUNC (button_press_event), splash);
+ g_signal_connect (splash, "button-press-event",
+ G_CALLBACK (button_press_event), splash);
gtk_object_set (GTK_OBJECT (splash), "type", GTK_WINDOW_TOPLEVEL, NULL);
gtk_window_set_position (GTK_WINDOW (splash), GTK_WIN_POS_CENTER);
@@ -357,7 +358,7 @@ e_splash_new (void)
new = gtk_type_new (e_splash_get_type ());
e_splash_construct (new, splash_image_pixbuf);
- gdk_pixbuf_unref (splash_image_pixbuf);
+ /* gdk_pixbuf_unref (splash_image_pixbuf); */
return GTK_WIDGET (new);
}