Convert GncTreeModelPrice and GncTreeModelCommodity to use GObject dispose

path instead of GtkObject destroy path.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13149 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Chris Shoemaker 2006-02-08 02:23:59 +00:00
parent 22d0463a3d
commit 3cb9687799
2 changed files with 10 additions and 16 deletions

View File

@ -50,7 +50,7 @@ static QofLogModule log_module = GNC_MOD_GUI;
static void gnc_tree_model_commodity_class_init (GncTreeModelCommodityClass *klass); static void gnc_tree_model_commodity_class_init (GncTreeModelCommodityClass *klass);
static void gnc_tree_model_commodity_init (GncTreeModelCommodity *model); static void gnc_tree_model_commodity_init (GncTreeModelCommodity *model);
static void gnc_tree_model_commodity_finalize (GObject *object); static void gnc_tree_model_commodity_finalize (GObject *object);
static void gnc_tree_model_commodity_destroy (GtkObject *object); static void gnc_tree_model_commodity_dispose (GObject *object);
static void gnc_tree_model_commodity_tree_model_init (GtkTreeModelIface *iface); static void gnc_tree_model_commodity_tree_model_init (GtkTreeModelIface *iface);
static guint gnc_tree_model_commodity_get_flags (GtkTreeModel *tree_model); static guint gnc_tree_model_commodity_get_flags (GtkTreeModel *tree_model);
@ -140,14 +140,11 @@ static void
gnc_tree_model_commodity_class_init (GncTreeModelCommodityClass *klass) gnc_tree_model_commodity_class_init (GncTreeModelCommodityClass *klass)
{ {
GObjectClass *o_class = G_OBJECT_CLASS (klass); GObjectClass *o_class = G_OBJECT_CLASS (klass);
GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass); parent_class = g_type_class_peek_parent (klass);
o_class->finalize = gnc_tree_model_commodity_finalize; o_class->finalize = gnc_tree_model_commodity_finalize;
o_class->dispose = gnc_tree_model_commodity_dispose;
/* GtkObject signals */
object_class->destroy = gnc_tree_model_commodity_destroy;
g_type_class_add_private(klass, sizeof(GncTreeModelCommodityPrivate)); g_type_class_add_private(klass, sizeof(GncTreeModelCommodityPrivate));
} }
@ -181,7 +178,7 @@ gnc_tree_model_commodity_finalize (GObject *object)
} }
static void static void
gnc_tree_model_commodity_destroy (GtkObject *object) gnc_tree_model_commodity_dispose (GObject *object)
{ {
GncTreeModelCommodity *model; GncTreeModelCommodity *model;
GncTreeModelCommodityPrivate *priv; GncTreeModelCommodityPrivate *priv;
@ -198,8 +195,8 @@ gnc_tree_model_commodity_destroy (GtkObject *object)
priv->event_handler_id = 0; priv->event_handler_id = 0;
} }
if (GTK_OBJECT_CLASS (parent_class)->destroy) if (G_OBJECT_CLASS (parent_class)->dispose)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object); G_OBJECT_CLASS (parent_class)->dispose (object);
LEAVE(" "); LEAVE(" ");
} }

View File

@ -69,7 +69,7 @@ static QofLogModule log_module = GNC_MOD_GUI;
static void gnc_tree_model_price_class_init (GncTreeModelPriceClass *klass); static void gnc_tree_model_price_class_init (GncTreeModelPriceClass *klass);
static void gnc_tree_model_price_init (GncTreeModelPrice *model); static void gnc_tree_model_price_init (GncTreeModelPrice *model);
static void gnc_tree_model_price_finalize (GObject *object); static void gnc_tree_model_price_finalize (GObject *object);
static void gnc_tree_model_price_destroy (GtkObject *object); static void gnc_tree_model_price_dispose (GObject *object);
static void gnc_tree_model_price_tree_model_init (GtkTreeModelIface *iface); static void gnc_tree_model_price_tree_model_init (GtkTreeModelIface *iface);
static guint gnc_tree_model_price_get_flags (GtkTreeModel *tree_model); static guint gnc_tree_model_price_get_flags (GtkTreeModel *tree_model);
@ -160,14 +160,11 @@ static void
gnc_tree_model_price_class_init (GncTreeModelPriceClass *klass) gnc_tree_model_price_class_init (GncTreeModelPriceClass *klass)
{ {
GObjectClass *o_class = G_OBJECT_CLASS (klass); GObjectClass *o_class = G_OBJECT_CLASS (klass);
GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
parent_class = g_type_class_peek_parent (klass); parent_class = g_type_class_peek_parent (klass);
o_class->finalize = gnc_tree_model_price_finalize; o_class->finalize = gnc_tree_model_price_finalize;
o_class->dispose = gnc_tree_model_price_dispose;
/* GtkObject signals */
object_class->destroy = gnc_tree_model_price_destroy;
g_type_class_add_private(klass, sizeof(GncTreeModelPricePrivate)); g_type_class_add_private(klass, sizeof(GncTreeModelPricePrivate));
} }
@ -207,7 +204,7 @@ gnc_tree_model_price_finalize (GObject *object)
} }
static void static void
gnc_tree_model_price_destroy (GtkObject *object) gnc_tree_model_price_dispose (GObject *object)
{ {
GncTreeModelPrice *model; GncTreeModelPrice *model;
GncTreeModelPricePrivate *priv; GncTreeModelPricePrivate *priv;
@ -224,8 +221,8 @@ gnc_tree_model_price_destroy (GtkObject *object)
priv->event_handler_id = 0; priv->event_handler_id = 0;
} }
if (GTK_OBJECT_CLASS (parent_class)->destroy) if (G_OBJECT_CLASS (parent_class)->dispose)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object); G_OBJECT_CLASS (parent_class)->dispose (object);
LEAVE(" "); LEAVE(" ");
} }