Re: [evolution-patches] etree patch

[Dan Winship <danw ximian com>]

> As far as the patch goes, the row_inserted and row_deleted signals are
> no longer attached, so it would probably be cleaner to remove all
> references to them.

Update patch with those signals removed, and two leaks plugged AT NO
EXTRA CHARGE!


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/ChangeLog,v
retrieving revision 1.790
diff -u -r1.790 ChangeLog
--- ChangeLog	25 Jun 2003 17:24:34 -0000	1.790
+++ ChangeLog	30 Jun 2003 16:53:11 -0000
@@ -1,3 +1,7 @@
+2003-06-30  Dan Winship  <danw ximian com>
+
+	* gal/widgets/e-reflow.c (e_reflow_dispose): unref the sorter
+
 2003-06-25  Mike Kestner  <mkestner ximian com>
 
 	* configure.in : releasing 1.99.8
Index: gal/e-table/ChangeLog
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/ChangeLog,v
retrieving revision 1.906
diff -u -r1.906 ChangeLog
--- gal/e-table/ChangeLog	23 Jun 2003 20:30:21 -0000	1.906
+++ gal/e-table/ChangeLog	30 Jun 2003 16:53:15 -0000
@@ -1,3 +1,13 @@
+2003-06-30  Dan Winship  <danw ximian com>
+
+	* 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.
+
 2003-06-22  Hans Petter Jansson  <hpj ximian com>
 
 	* e-cell-text.c (get_font_for_size): Implement.
Index: gal/e-table/e-table.c
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/e-table.c,v
retrieving revision 1.224
diff -u -r1.224 e-table.c
--- gal/e-table/e-table.c	19 Jun 2003 15:31:31 -0000	1.224
+++ gal/e-table/e-table.c	30 Jun 2003 16:53:17 -0000
@@ -2663,6 +2663,8 @@
 	site = table->site;
 
 	if (site) {
+		if (site->target_list)
+			gtk_target_list_unref (site->target_list);
 		g_free (site);
 		table->site = NULL;
 	}
Index: gal/e-table/e-tree.c
===================================================================
RCS file: /cvs/gnome/gal/gal/e-table/e-tree.c,v
retrieving revision 1.104
diff -u -r1.104 e-tree.c
--- gal/e-table/e-tree.c	13 Jun 2003 22:27:03 -0000	1.104
+++ gal/e-table/e-tree.c	30 Jun 2003 16:53:19 -0000
@@ -141,8 +141,6 @@
 	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 @@
 	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->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->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;
Index: gal/widgets/e-reflow.c
===================================================================
RCS file: /cvs/gnome/gal/gal/widgets/e-reflow.c,v
retrieving revision 1.50
diff -u -r1.50 e-reflow.c
--- gal/widgets/e-reflow.c	21 Mar 2003 10:21:45 -0000	1.50
+++ gal/widgets/e-reflow.c	30 Jun 2003 16:53:21 -0000
@@ -772,7 +772,9 @@
 	
 	g_free(reflow->empty_message);
 	reflow->empty_message = NULL;
-  
+
+	g_object_unref (reflow->sorter);
+
 	G_OBJECT_CLASS(parent_class)->dispose (object);
 }