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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2009-05-27 17:15:22 +0300 (Wed, 27 May 2009)
New Revision: 18510

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
Log:
2009-05-27  Philip Van Hoof  <philip at codeminded.be>

        * thumbs/hildon-thumbnail-obj.c
        * tests/artist-art-test.c: NB#116170



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-27 13:30:09 UTC (rev 18509)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-27 14:15:22 UTC (rev 18510)
@@ -1,3 +1,8 @@
+2009-05-27  Philip Van Hoof  <philip at codeminded.be>
+
+	* thumbs/hildon-thumbnail-obj.c
+	* tests/artist-art-test.c: NB#116170 
+
 2009-05-27  Mikael Ottela <mikael.ottela at ixonos.com>
 
 	* thumbnailers/gst-video-thumbnailer/gst-thumb-pipe.c: A postfix fix

Modified: projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c	2009-05-27 13:30:09 UTC (rev 18509)
+++ projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c	2009-05-27 14:15:22 UTC (rev 18510)
@@ -101,7 +101,7 @@
 
 
  hildon_thumbnail_factory_request_pixbuf (hildon_thumbnail_factory_get_instance (),
-            "file:///home/pvanhoof/.cache/media-art/album-7215ee9c7d9dc229d2921a40e899ec5f-3e2d42595d728926108329d9771c92d7.jpeg",
+            "file:///Does'nexist",
             256, 256,
             FALSE,
             NULL,

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2009-05-27 13:30:09 UTC (rev 18509)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2009-05-27 14:15:22 UTC (rev 18510)
@@ -127,8 +127,8 @@
 
 		for (i = CHECKER; i < 3 && have; i++) {
 			gchar *localp = g_filename_from_uri (lpaths[i], NULL, NULL);
-			have = (g_file_test (paths[i], G_FILE_TEST_EXISTS) || 
-				g_file_test (localp, G_FILE_TEST_EXISTS));
+			have = (paths[i] && g_file_test (paths[i], G_FILE_TEST_EXISTS) || 
+				localp && g_file_test (localp, G_FILE_TEST_EXISTS));
 			g_free (localp);
 		}
 	}
@@ -479,8 +479,8 @@
 
 		for (i = CHECKER; i < 3  && have; i++) {
 			gchar *localp = g_filename_from_uri (lpaths[i], NULL, NULL);
-			have = (g_file_test (paths[i], G_FILE_TEST_EXISTS) || 
-				g_file_test (localp, G_FILE_TEST_EXISTS));
+			have = (paths[i] && g_file_test (paths[i], G_FILE_TEST_EXISTS) || 
+				localp && g_file_test (localp, G_FILE_TEST_EXISTS));
 			g_free (localp);
 		}
 	}