aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table/e-table-col.c
diff options
context:
space:
mode:
authorMike Kestner <mkestner@src.gnome.org>2002-11-01 05:30:57 +0800
committerMike Kestner <mkestner@src.gnome.org>2002-11-01 05:30:57 +0800
commit613453b1095e325149b8d37e5731d415e1d5f9bd (patch)
tree1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/table/e-table-col.c
parentec242d6c30d7bf056c8f59710b8576c942f93583 (diff)
downloadgsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz
gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst
gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk. svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/table/e-table-col.c')
-rw-r--r--widgets/table/e-table-col.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index fa53fb0d0c..bf538280c6 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* e-table-col.c
* Copyright 1999, 2000, 2001, Ximian, Inc.
*
@@ -29,7 +29,7 @@
#define PARENT_TYPE (gtk_object_get_type ())
-static GtkObjectClass *parent_class;
+static GObjectClass *parent_class;
enum {
@@ -39,21 +39,25 @@ enum {
};
static void
-etc_destroy (GtkObject *object)
+etc_finalize (GObject *object)
{
ETableCol *etc = E_TABLE_COL (object);
- gtk_object_unref (GTK_OBJECT(etc->ecell));
+ if (etc->ecell)
+ gtk_object_unref (GTK_OBJECT(etc->ecell));
+ etc->ecell = NULL;
if (etc->pixbuf)
gdk_pixbuf_unref (etc->pixbuf);
+ etc->pixbuf = NULL;
+
if (etc->text)
g_free (etc->text);
+ etc->text = NULL;
- (*parent_class->destroy)(object);
+ parent_class->finalize (object);
}
-
static void
etc_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
{
@@ -91,10 +95,11 @@ static void
e_table_col_class_init (GtkObjectClass *object_class)
{
parent_class = gtk_type_class (PARENT_TYPE);
- object_class->destroy = etc_destroy;
object_class->get_arg = etc_get_arg;
object_class->set_arg = etc_set_arg;
+ G_OBJECT_CLASS (object_class)->finalize = etc_finalize;
+
gtk_object_add_arg_type ("ETableCol::sortable",
GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_SORTABLE);
gtk_object_add_arg_type ("ETableCol::compare_col",