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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2009-05-07 17:30:21 +0300 (Thu, 07 May 2009)
New Revision: 18288

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
   projects/haf/trunk/hildon-thumbnail/tests/Makefile.am
   projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
Log:
2009-05-07  Philip Van Hoof  <pvanhoof at codeminded.be>

        * tests/artist-art-test.c
        * tests/Makefile.am
        * thumbs/hildon-thumbnail-obj.c
        * daemon/thumbnailer.c: Bugfixes for a use-case provided by Email



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-07 13:48:37 UTC (rev 18287)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-07 14:30:21 UTC (rev 18288)
@@ -1,3 +1,10 @@
+2009-05-07  Philip Van Hoof  <pvanhoof at codeminded.be>
+
+	* tests/artist-art-test.c
+	* tests/Makefile.am
+	* thumbs/hildon-thumbnail-obj.c
+	* daemon/thumbnailer.c: Bugfixes for a use-case provided by Email
+
 2009-05-06  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 3.0.24

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2009-05-07 13:48:37 UTC (rev 18287)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2009-05-07 14:30:21 UTC (rev 18288)
@@ -273,9 +273,6 @@
 
 	dbus_async_return_if_fail (urls != NULL, context);
 
-	if (mime_hints)
-		dbus_async_return_if_fail (g_strv_length (urls) == g_strv_length (mime_hints), context);
-
 	task = g_slice_new (WorkTask);
 
 	keep_alive ();
@@ -486,13 +483,16 @@
 		GError *error = NULL;
 		gchar *normal = NULL, *large = NULL, *cropped = NULL;
 		guint64 mtime_x = 0;
+		gchar *mhint = NULL;
 
 		hildon_thumbnail_util_get_thumb_paths (urls[i], &large, &normal, &cropped, 
 						       NULL, NULL, NULL, FALSE);
 
+		if (mime_types && g_strv_length (mime_types) >= i)
+			mhint = mime_types[i];
+
 		get_some_file_infos (urls[i], &mime_type, &mtime_x,
-				     mime_types?mime_types[i]:NULL, 
-				     &error);
+				     mhint, &error);
 
 		has_thumb = (thumb_check (large, mtime_x) && 
 			     thumb_check (normal, mtime_x) && 

Modified: projects/haf/trunk/hildon-thumbnail/tests/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/tests/Makefile.am	2009-05-07 13:48:37 UTC (rev 18287)
+++ projects/haf/trunk/hildon-thumbnail/tests/Makefile.am	2009-05-07 14:30:21 UTC (rev 18288)
@@ -1,6 +1,6 @@
 INCLUDES = -I$(srcdir)/../thumbs -I$(srcdir)/.. $(PKG_CFLAGS) \
 	$(DBUS_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(GIO_CFLAGS) \
-	$(GDK_PIXBUF_CFLAGS) $(GTK_CFLAGS)
+	$(GDK_PIXBUF_CFLAGS) $(GTK_CFLAGS) -ggdb -O0
 
 BUILT_SOURCES = daemon-glue.h
 

Modified: projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c	2009-05-07 13:48:37 UTC (rev 18287)
+++ projects/haf/trunk/hildon-thumbnail/tests/artist-art-test.c	2009-05-07 14:30:21 UTC (rev 18288)
@@ -1,5 +1,6 @@
 #include <gtk/gtk.h>
 #include <hildon-albumart-factory.h>
+#include <hildon-thumbnail-factory.h>
 
 
 GtkWindow *window;
@@ -33,9 +34,22 @@
 }
 #endif
 
+static void 
+_thumbnail_created_cb (HildonThumbnailFactory *self,
+            GdkPixbuf *thumbnail, GError *error, gpointer user_data) {                             
+    printf("thumbnail_created_cb\n");                                                                  
+    if(error)
+        printf("Error: %s\n",error->message);                                                          
+    if(thumbnail)                                                                                      
+    {                                                                                                  
+    }
+    else printf("thumbnail: NULL\n");                                                                  
+} 
+
 static void
 on_button_clicked (GtkButton *button, gpointer user_data)
 {
+/*
 	gchar *album, *artist;
 
 	album = gtk_entry_get_text (btext);
@@ -69,14 +83,27 @@
                  on_art_back, imaget, NULL);
 
 
-	g_print ("%s\n", hildon_albumart_get_path("Nelly Furtado",
+
+g_print ("%s\n", hildon_albumart_get_path("Nelly Furtado",
                  "2008 Grammy Nominees", "album"));
+*/
 
+ hildon_thumbnail_factory_request_pixbuf (hildon_thumbnail_factory_get_instance (),
+            "file:///home/pvanhoof/.cache/media-art/album-7215ee9c7d9dc229d2921a40e899ec5f-3e2d42595d728926108329d9771c92d7.jpeg",
+            128, 128,
+            FALSE,
+            NULL,
+            _thumbnail_created_cb,
+            NULL/*item*/,
+            NULL);
+
+
+/*
 	g_object_unref (f);
 	g_object_unref (r1);
 	g_object_unref (r2);
 #endif
-
+*/
 }
 
 int

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2009-05-07 13:48:37 UTC (rev 18287)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2009-05-07 14:30:21 UTC (rev 18288)
@@ -422,17 +422,8 @@
 
 	gchar *key = g_strdup_printf ("%d", OUT_handle);
 	r_priv->key = key;
-
-	if (!error) {
-		g_hash_table_replace (f_priv->tasks, g_strdup (key), 
+	g_hash_table_replace (f_priv->tasks, g_strdup (key), 
 			      g_object_ref (request));
-	} else {
-		if (r_priv->pcallback)
-			r_priv->pcallback (r_priv->factory, NULL, error, r_priv->user_data);
-		if (r_priv->ucallback)
-			r_priv->ucallback (r_priv->factory, NULL, error, r_priv->user_data);
-	}
-
 	waiting_for_cb = FALSE;
 
 	g_object_unref (request);