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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Thu Oct 16 16:54:15 EEST 2008 
Author: pvanhoof
Date: 2008-10-16 16:54:12 +0300 (Thu, 16 Oct 2008)
New Revision: 16430

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/albumart-manager.c
   projects/haf/trunk/hildon-thumbnail/daemon/albumart.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
Log:
2008-10-16  Philip Van Hoof  <philip at codeminded.be>

	* thumbs/hildon-thumbnail-factory.c
	* thumbs/hildon-thumbnail-obj.c
	* thumbs/hildon-albumart-factory.c
	* daemon/plugins/gstreamer-video-plugin.c
      	* daemon/albumart.c
	* daemon/albumart-manager.c: Making things -Wall warning free



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-10-16 13:44:33 UTC (rev 16429)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-10-16 13:54:12 UTC (rev 16430)
@@ -1,3 +1,12 @@
+2008-10-16  Philip Van Hoof  <philip at codeminded.be>
+
+	* thumbs/hildon-thumbnail-factory.c
+	* thumbs/hildon-thumbnail-obj.c
+	* thumbs/hildon-albumart-factory.c
+	* daemon/plugins/gstreamer-video-plugin.c
+      	* daemon/albumart.c
+	* daemon/albumart-manager.c: Making things -Wall warning free
+
 2008-10-15  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 3.0.5

Modified: projects/haf/trunk/hildon-thumbnail/daemon/albumart-manager.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/albumart-manager.c	2008-10-16 13:44:33 UTC (rev 16429)
+++ projects/haf/trunk/hildon-thumbnail/daemon/albumart-manager.c	2008-10-16 13:54:12 UTC (rev 16430)
@@ -109,7 +109,6 @@
 albumart_manager_add (AlbumartManager *object, ValueInfo *info)
 {
 	AlbumartManagerPrivate *priv = ALBUMART_MANAGER_GET_PRIVATE (object);
-	DBusGProxy *proxy;
 	gchar *path = g_strdup_printf ("/%s", info->name);
 	guint len = strlen (path);
 	guint i;
@@ -142,7 +141,6 @@
 static void
 albumart_manager_check_dir (AlbumartManager *object, gchar *path, gboolean override)
 {
-	AlbumartManagerPrivate *priv = ALBUMART_MANAGER_GET_PRIVATE (object);
 	const gchar *filen;
 	GDir *dir;
 
@@ -156,7 +154,6 @@
 		gchar *fullfilen;
 		gchar *value;
 		GError *error = NULL;
-		guint i = 0;
 		guint64 mtime;
 		GFileInfo *info;
 		GFile *file;
@@ -264,7 +261,6 @@
 albumart_manager_check (AlbumartManager *object)
 {
 	AlbumartManagerPrivate *priv = ALBUMART_MANAGER_GET_PRIVATE (object);
-	GFileMonitor *monitor;
 
 	g_mutex_lock (priv->mutex);
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/albumart.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/albumart.c	2008-10-16 13:44:33 UTC (rev 16429)
+++ projects/haf/trunk/hildon-thumbnail/daemon/albumart.c	2008-10-16 13:54:12 UTC (rev 16430)
@@ -28,6 +28,7 @@
 #endif
 
 #include <string.h>
+#include <ctype.h>
 #include <glib.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib-bindings.h>
@@ -177,29 +178,7 @@
 }
 #endif
 
-static gchar*
-find_image_file_in_for (GDir *dir, gchar *filename) 
-{
-	gchar *retval = NULL;
-	const gchar *item;
-	gsize s = (gsize) strlen (filename);
 
-	while (item = g_dir_read_name (dir)) {
-		if ((strcasestr ((char *) item, (char *) ".jpeg") || 
-		     strcasestr ((char *) item, (char *) ".jpg") ) &&
-		    (s == 0 || g_ascii_strncasecmp (item, filename, s) == 0)
-		  ) 
-		{
-			retval = g_strdup (item);
-			break;
-		}
-	}
-
-	g_dir_rewind (dir);
-
-	return retval;
-}
-
 /* This is the threadpool's function. This means that everything we do is 
  * asynchronous wrt to the mainloop (we aren't blocking it). Because it all 
  * happens in a thread, we must care about proper locking, too.

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-10-16 13:44:33 UTC (rev 16429)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-10-16 13:54:12 UTC (rev 16430)
@@ -35,6 +35,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "hildon-thumbnail-plugin.h"
+#include "utils.h"
 
 #define GSTP_ERROR_DOMAIN	"HildonThumbnailerGStreamerVideoPlugin"
 #define GSTP_ERROR		g_quark_from_static_string (GSTP_ERROR_DOMAIN)
@@ -81,6 +82,12 @@
 
 static gboolean callback_bus(GstBus *bus, GstMessage *message, VideoThumbnailer *thumber);
 
+#ifndef g_sprintf
+gint                g_sprintf                           (gchar *string,
+                                                         gchar const *format,
+                                                         ...);
+#endif
+
 static gboolean 
 save_thumb_file_meta (GdkPixbuf *pixbuf, const gchar *file, guint64 mtime, const gchar *uri, GError **error)
 {
@@ -399,8 +406,6 @@
 const gchar** 
 hildon_thumbnail_plugin_supported (void)
 {
-	GstFormatDefinition def;
-	GstIterator *iter;
 
 /* 	iter = gst_format_iterate_definitions(); */
 	

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c	2008-10-16 13:44:33 UTC (rev 16429)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c	2008-10-16 13:54:12 UTC (rev 16430)
@@ -170,7 +170,6 @@
 	ArtsItem *item = g_hash_table_lookup (tasks, key);
 
 	if (item) {
-		GError *error = NULL;
 		gchar *path;
 
 		/* Get the large small and cropped path for the original
@@ -182,8 +181,6 @@
 
 		create_pixbuf_and_callback (item, path);
 
-		error_handler:
-
 		g_free (path);
 
 		/* Remove the key from the hash, which means that we declare it 
@@ -350,7 +347,6 @@
 {
 	const gchar *artist = artist_or_title;
 	gchar *path;
-	GError *error = NULL;
 	ArtsItem *item;
 	gboolean have_all = FALSE;
 
@@ -380,7 +376,7 @@
 		g_idle_add_full (G_PRIORITY_DEFAULT, have_all_cb, info,
 						 (GDestroyNotify) free_thumbsitem_and_paths);
 
-		return;
+		return item;
 	}
 
 	g_free (path);

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c	2008-10-16 13:44:33 UTC (rev 16429)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c	2008-10-16 13:54:12 UTC (rev 16430)
@@ -164,7 +164,6 @@
 
 	if (item) {
 		gchar *large = NULL, *normal = NULL, *cropped = NULL;
-		GError *error = NULL;
 
 		/* Get the large small and cropped path for the original
 		 * URI */
@@ -174,8 +173,6 @@
 
 		create_pixbuf_and_callback (item, large, normal, cropped);
 
-		error_handler:
-
 		g_free (cropped);
 		g_free (normal);
 		g_free (large);

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2008-10-16 13:44:33 UTC (rev 16429)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2008-10-16 13:54:12 UTC (rev 16430)
@@ -25,6 +25,7 @@
 #include <gio/gio.h>
 #include <glib/gfileutils.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <stdlib.h>
 
 #include "hildon-thumbnail-factory.h"
 #include "thumbnailer-client.h"
@@ -62,7 +63,18 @@
 			    GError       **error);
 #endif 
 
+#ifndef gdk_pixbuf_new_from_stream_at_scale
+/* It's implemented in pixbuf-io-loader.c in this case */
+GdkPixbuf *
+gdk_pixbuf_new_from_stream_at_scale (GInputStream  *stream,
+				     gint	    width,
+				     gint 	    height,
+				     gboolean       preserve_aspect_ratio,
+				     GCancellable  *cancellable,
+		  	    	     GError       **error);
+#endif
 
+
 static void
 create_pixbuf_and_callback (HildonThumbnailRequestPrivate *r_priv)
 {
@@ -126,7 +138,6 @@
 		  guint       handle,
 		  gpointer    user_data)
 {
-	HildonThumbnailFactory *self = user_data;
 	HildonThumbnailFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (user_data);
 	gchar *key = g_strdup_printf ("%d", handle);
 	HildonThumbnailRequest *request = g_hash_table_lookup (f_priv->tasks, key);
More information about the maemo-commits mailing list