[maemo-commits] [maemo-commits] r18326 - in projects/haf/trunk/hildon-thumbnail: . thumbs

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2009-05-12 12:37:01 +0300 (Tue, 12 May 2009)
New Revision: 18326

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
Log:
2009-05-12  Philip Van Hoof  <pvanhoof at codeminded.be>

        * thumbs/hildon-thumbnail-obj.c: Memleak fix, Bugfix for Bug #116170



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-12 09:24:46 UTC (rev 18325)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-12 09:37:01 UTC (rev 18326)
@@ -1,5 +1,9 @@
 2009-05-12  Philip Van Hoof  <pvanhoof at codeminded.be>
 
+	* thumbs/hildon-thumbnail-obj.c: Memleak fix, Bugfix for Bug #116170
+
+2009-05-12  Philip Van Hoof  <pvanhoof at codeminded.be>
+
 	* daemon/hildon-thumbnail-plugin.h:
 	* daemon/plugins/gdkpixbuf-plugin.c:
 	* daemon/plugins/gdkpixbuf-png-out-plugin.c:

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2009-05-12 09:24:46 UTC (rev 18325)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2009-05-12 09:37:01 UTC (rev 18326)
@@ -122,50 +122,39 @@
 	}
 
 	if (r_priv->cropped) {
-		GFile *temp = g_file_new_for_uri (lpaths[2]);
-		if (!g_file_query_exists (temp, NULL)) {
-			filei = g_file_new_for_path (paths[2]);
-			g_object_unref (temp);
-		} else
-			filei = temp;
-	} else if (r_priv->width > 128 || r_priv->height > 128) {
-		GFile *temp = g_file_new_for_uri (lpaths[0]);
-		if (!g_file_query_exists (temp, NULL)) {
-			filei = g_file_new_for_path (paths[0]);
-			g_object_unref (temp);
-		} else
-			filei = temp;
-	} else {
-		GFile *temp = g_file_new_for_uri (lpaths[1]);
-		if (!g_file_query_exists (temp, NULL)) {
-			filei = g_file_new_for_path (paths[1]);
-			g_object_unref (temp);
-		} else
-			filei = temp;
-	}
-
-	if (r_priv->cropped) {
 		local = g_file_new_for_uri (lpaths[2]);
 		if (!g_file_query_exists (local, NULL)) {
+			if (filei)
+				g_object_unref (filei);
 			filei = g_file_new_for_path (paths[2]);
 			g_object_unref (local);
 		} else {
+			if (filei)
+				g_object_unref (filei);
 			filei = local;
 		}
 	} else if (r_priv->width > 128 || r_priv->height > 128) {
 		local = g_file_new_for_uri (lpaths[1]);
 		if (!g_file_query_exists (local, NULL)) {
+			if (filei)
+				g_object_unref (filei);
 			filei = g_file_new_for_path (paths[1]);
 			g_object_unref (local);
 		} else {
+			if (filei)
+				g_object_unref (filei);
 			filei = local;
 		}
 	} else {
 		local = g_file_new_for_uri (lpaths[0]);
 		if (!g_file_query_exists (local, NULL)) {
+			if (filei)
+				g_object_unref (filei);
 			filei = g_file_new_for_path (paths[0]);
 			g_object_unref (local);
 		} else {
+			if (filei)
+				g_object_unref (filei);
 			filei = local;
 		}
 	}