From cfacfc319d8d5b684f9ee2b039f9f9a8cef63499 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 1 Jul 2003 13:16:43 +0000 Subject: Initialize some missing fields. Fixes "no handler with id" warnings at evo * e-tree.c (e_tree_init): Initialize some missing fields. Fixes "no handler with id" warnings at evo shutdown (ETreePriv): remove unused table_rows_{inserted,deleted}_id (et_disconnect_from_etta): remove refs to them * e-table.c (e_table_drag_source_unset): free site->target_list if it's set. svn path=/trunk/; revision=21705 --- widgets/table/e-table.c | 2 ++ widgets/table/e-tree.c | 15 +++++---------- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'widgets') diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 8e4dfb00f3..2af54c591b 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -2663,6 +2663,8 @@ e_table_drag_source_unset (ETable *table) site = table->site; if (site) { + if (site->target_list) + gtk_target_list_unref (site->target_list); g_free (site); table->site = NULL; } diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 98d75ec642..938fd45136 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -141,8 +141,6 @@ struct ETreePriv { int table_model_change_id; int table_row_change_id; int table_cell_change_id; - int table_rows_inserted_id; - int table_rows_deleted_id; GnomeCanvas *header_canvas, *table_canvas; @@ -260,18 +258,10 @@ et_disconnect_from_etta (ETree *et) if (et->priv->table_cell_change_id != 0) g_signal_handler_disconnect (G_OBJECT (et->priv->etta), et->priv->table_cell_change_id); - if (et->priv->table_rows_inserted_id != 0) - g_signal_handler_disconnect (G_OBJECT (et->priv->etta), - et->priv->table_rows_inserted_id); - if (et->priv->table_rows_deleted_id != 0) - g_signal_handler_disconnect (G_OBJECT (et->priv->etta), - et->priv->table_rows_deleted_id); et->priv->table_model_change_id = 0; et->priv->table_row_change_id = 0; et->priv->table_cell_change_id = 0; - et->priv->table_rows_inserted_id = 0; - et->priv->table_rows_deleted_id = 0; } static void @@ -558,6 +548,10 @@ e_tree_init (GtkObject *object) e_tree->priv->scroll_idle_id = 0; e_tree->priv->hover_idle_id = 0; + e_tree->priv->table_model_change_id = 0; + e_tree->priv->table_row_change_id = 0; + e_tree->priv->table_cell_change_id = 0; + e_tree->priv->alternating_row_colors = 1; e_tree->priv->horizontal_draw_grid = 1; e_tree->priv->vertical_draw_grid = 1; @@ -568,6 +562,7 @@ e_tree_init (GtkObject *object) e_tree->priv->row_selection_active = FALSE; e_tree->priv->horizontal_scrolling = FALSE; + e_tree->priv->scroll_direction = 0; e_tree->priv->drop_row = -1; e_tree->priv->drop_path = NULL; -- cgit