[maemo-commits] [maemo-commits] r16271 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon tests

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-09-29 16:06:10 +0300 (Mon, 29 Sep 2008)
New Revision: 16271

Modified:
   projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart-manager.c
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart.c
   projects/haf/branches/hildon-thumbnail/daemonize/tests/Makefile.am
Log:
2008-09-29  Philip Van Hoof  <pvanhoof at gnome.org>

	* tests/Makefile.am
	* daemon/albumart.c
	* daemon/albumart-manager.c: Various small bugfixes that make the
	requester work



Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog	2008-09-29 13:04:27 UTC (rev 16270)
+++ projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog	2008-09-29 13:06:10 UTC (rev 16271)
@@ -1,5 +1,12 @@
 2008-09-29  Philip Van Hoof  <pvanhoof at gnome.org>
 
+	* tests/Makefile.am
+	* daemon/albumart.c
+	* daemon/albumart-manager.c: Various small bugfixes that make the
+	requester work
+
+2008-09-29  Philip Van Hoof  <pvanhoof at gnome.org>
+
 	* tests/com.nokia.albumart.AlbumartProvider.GoogleImages.service
 	* tests/Makefile.am
 	* tests/com.nokia.albumart.GoogleImages.service.in: Made the GoogleImages

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart-manager.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart-manager.c	2008-09-29 13:04:27 UTC (rev 16270)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart-manager.c	2008-09-29 13:06:10 UTC (rev 16271)
@@ -157,8 +157,6 @@
 
 		file = g_file_new_for_path (fullfilen);
 
-		g_free (fullfilen);
-
 		info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
 					  G_FILE_QUERY_INFO_NONE,
 					  NULL, &error);
@@ -172,6 +170,7 @@
 				g_object_unref (file);
 			g_free (value);
 			g_key_file_free (keyfile);
+			g_free (fullfilen);
 			continue;
 		}
 
@@ -194,9 +193,11 @@
 		v_info->prio = FALSE;
 
 		g_hash_table_replace (pre, 
-						      g_strdup (path), 
+						      g_strdup (fullfilen), 
 						      v_info);
 
+		g_free (fullfilen);
+
 		if (info)
 			g_object_unref (info);
 		if (file)

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart.c	2008-09-29 13:04:27 UTC (rev 16270)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/albumart.c	2008-09-29 13:06:10 UTC (rev 16271)
@@ -193,7 +193,8 @@
 
 				// PROVIDER_INTERFACE
 				dbus_g_proxy_call (proxy, "Fetch", &error, 
-						   G_TYPE_STRING, albumartist, uri,
+						   G_TYPE_STRING, albumartist,
+						   G_TYPE_STRING, uri,
 						   G_TYPE_INVALID, 
 						   G_TYPE_INVALID);
 

Modified: projects/haf/branches/hildon-thumbnail/daemonize/tests/Makefile.am
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/tests/Makefile.am	2008-09-29 13:04:27 UTC (rev 16270)
+++ projects/haf/branches/hildon-thumbnail/daemonize/tests/Makefile.am	2008-09-29 13:06:10 UTC (rev 16271)
@@ -57,6 +57,6 @@
 CLEANFILES = $(BUILT_SOURCES) \
 	$(org.freedesktop.thumbnailer_service_DATA)
 
-albartdowndir = /usr/share/albumart_providers
+albartdowndir = /usr/share/albumart-providers
 albartdown_DATA = com.nokia.albumart.AlbumartProvider.GoogleImages.service