evolution r34868 - trunk/widgets/table

[mcrha svn gnome org]

Author: mcrha
Date: Tue Jan 22 19:40:45 2008
New Revision: 34868
URL: http://svn.gnome.org/viewvc/evolution?rev=34868&view=rev

Log:
2008-01-22  Milan Crha  <mcrha redhat com>

	** Fix for bug #511105

	* e-tree-table-adapter.c: (e_tree_table_adapter_load_expanded_state):
	* e-table-item.c: (eti_draw):
	* e-table-column-specification.c: (free_strings): 
	Free allocated memory properly.



Modified:
   trunk/widgets/table/ChangeLog
   trunk/widgets/table/e-table-column-specification.c
   trunk/widgets/table/e-table-item.c
   trunk/widgets/table/e-tree-table-adapter.c

Modified: trunk/widgets/table/e-table-column-specification.c
==============================================================================
--- trunk/widgets/table/e-table-column-specification.c	(original)
+++ trunk/widgets/table/e-table-column-specification.c	Tue Jan 22 19:40:45 2008
@@ -50,6 +50,8 @@
 	etcs->compare = NULL;
 	g_free(etcs->search);
 	etcs->search = NULL;
+	g_free (etcs->sortable);
+	etcs->sortable = NULL;
 }
 
 static void

Modified: trunk/widgets/table/e-table-item.c
==============================================================================
--- trunk/widgets/table/e-table-item.c	(original)
+++ trunk/widgets/table/e-table-item.c	Tue Jan 22 19:40:45 2008
@@ -1872,7 +1872,7 @@
 	 * Nothing to paint
 	 */
 	if (first_col == -1)
-		return;
+		goto exit;
 
 	/*
 	 * Compute row span.
@@ -1881,7 +1881,7 @@
 		first_row = (y          - floor (eti_base.y) - height_extra) / (eti_row_height (eti, -1) + height_extra);
 		last_row  = (y + height - floor (eti_base.y)               ) / (eti_row_height (eti, -1) + height_extra) + 1;
 		if (first_row > last_row)
-			return;
+			goto exit;
 		y_offset = floor (eti_base.y) - y + height_extra + first_row * (eti_row_height (eti, -1) + height_extra);
 		if (first_row < 0)
 			first_row = 0;
@@ -1912,11 +1912,11 @@
 		last_row = row;
 
 		if (first_row == -1)
-			return;
+			goto exit;
 	}
 
 	if (first_row == -1)
-		return;
+		goto exit;
 
 	/*
 	 * Draw cells
@@ -2107,8 +2107,9 @@
 		gdk_draw_rectangle (drawable, eti->focus_gc, FALSE,
 				    f_x1, f_y1, f_x2 - f_x1 - 1, f_y2 - f_y1);
 	}
-	cairo_destroy (cr);
 
+exit:
+	cairo_destroy (cr);
 }
 
 static double

Modified: trunk/widgets/table/e-tree-table-adapter.c
==============================================================================
--- trunk/widgets/table/e-tree-table-adapter.c	(original)
+++ trunk/widgets/table/e-tree-table-adapter.c	Tue Jan 22 19:40:45 2008
@@ -1050,6 +1050,8 @@
 			file_default = TRUE;
 		else
 			file_default = FALSE; /* Even unspecified we'll consider as false */
+
+		g_free (state);
 	}
 
 	/* Incase the default is changed, lets forget the changes and stick to default */