libgda r3151 - in trunk: . libgda

[vivien svn gnome org]

Author: vivien
Date: Tue May 20 19:17:44 2008
New Revision: 3151
URL: http://svn.gnome.org/viewvc/libgda?rev=3151&view=rev

Log:
2008-05-20  Vivien Malerba <malerba gnome-db org>

	* libgda/gda-connection.c: applied path to xi mem leak (thanks to
	from Phil Longstaff)
	* libgda/gda-data-model.c:
	* libgda/gda-util.c:
	* libgda/gda-data-model-array.c: cosmetic changes


Modified:
   trunk/ChangeLog
   trunk/libgda/gda-connection.c
   trunk/libgda/gda-data-model-array.c
   trunk/libgda/gda-data-model.c
   trunk/libgda/gda-util.c

Modified: trunk/libgda/gda-connection.c
==============================================================================
--- trunk/libgda/gda-connection.c	(original)
+++ trunk/libgda/gda-connection.c	Tue May 20 19:17:44 2008
@@ -242,6 +242,11 @@
 		cnc->priv->trans_status = NULL;
 	}
 
+	if (cnc->priv->meta_store != NULL) {
+	        g_object_unref (cnc->priv->meta_store);
+	        cnc->priv->meta_store = NULL;
+	}
+
 	/* chain to parent class */
 	parent_class->dispose (object);
 }

Modified: trunk/libgda/gda-data-model-array.c
==============================================================================
--- trunk/libgda/gda-data-model-array.c	(original)
+++ trunk/libgda/gda-data-model-array.c	Tue May 20 19:17:44 2008
@@ -440,7 +440,7 @@
 
 		g_object_get (G_OBJECT (srccol), "id", &colid, NULL);
 		g_object_set (G_OBJECT (copycol), "id", colid, NULL);
-		g_free(colid);
+		g_free (colid);
 		gda_column_set_title (copycol, gda_column_get_title (srccol));
 		gda_column_set_defined_size (copycol, gda_column_get_defined_size (srccol));
 		gda_column_set_name (copycol, gda_column_get_name (srccol));

Modified: trunk/libgda/gda-data-model.c
==============================================================================
--- trunk/libgda/gda-data-model.c	(original)
+++ trunk/libgda/gda-data-model.c	Tue May 20 19:17:44 2008
@@ -1475,8 +1475,7 @@
 			column = NULL;
 		else
 			*pos = c;
-		if(id != NULL)
-			g_free(id);
+		g_free (id);
 	}
 
 	/* if no column has been found, assumr @colid is like "_%d" where %d is a column number */

Modified: trunk/libgda/gda-util.c
==============================================================================
--- trunk/libgda/gda-util.c	(original)
+++ trunk/libgda/gda-util.c	Tue May 20 19:17:44 2008
@@ -307,7 +307,7 @@
 			else
 				col_ids [c] = g_strdup_printf ("_%d", c);
 
-			g_free(id);
+			g_free (id);
 		}
 	}