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

Mon Nov 17 14:40:14 EET 2008

Author: marivoll
Date: 2008-11-17 14:40:13 +0200 (Mon, 17 Nov 2008)
New Revision: 16692

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/albumart.c
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
Log:
	Cleaning up a bit.  Removed unused local variables all over the
	place, and also:

	* daemon/albumart.c: Removed strcasestr.
	* daemon/plugins/gdkpixbuf-jpeg-out-plugin.c: Include
	<glib/gstdio.h> for g_stat.
	* daemon/plugins/gdkpixbuf-png-out-plugin.c: Likewise.
	(hildon_thumbnail_outplugin_out): Use "%Lu" for 64 bit quantity.
	* daemon/thumbnailer.c: Include <ctype.h> for toupper.


Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================

--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-17 10:16:16 UTC (rev 16691)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-17 12:40:13 UTC (rev 16692)
@@ -1,3 +1,15 @@
+2008-11-17  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	Cleaning up a bit.  Removed unused local variables all over the
+	place, and also:
+
+	* daemon/albumart.c: Removed strcasestr.
+	* daemon/plugins/gdkpixbuf-jpeg-out-plugin.c: Include
+	<glib/gstdio.h> for g_stat.
+	* daemon/plugins/gdkpixbuf-png-out-plugin.c: Likewise.
+	(hildon_thumbnail_outplugin_out): Use "%Lu" for 64 bit quantity.
+	* daemon/thumbnailer.c: Include <ctype.h> for toupper.
+
 2008-11-17  Philip Van Hoof  <philip at codeminded.be>
 
 	* daemon/hildon-thumbnail-plugin.h

Modified: projects/haf/trunk/hildon-thumbnail/daemon/albumart.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/albumart.c	2008-11-17 10:16:16 UTC (rev 16691)
+++ projects/haf/trunk/hildon-thumbnail/daemon/albumart.c	2008-11-17 12:40:13 UTC (rev 16692)
@@ -155,30 +155,6 @@
 	dbus_g_method_return (context, num);
 }
 
-#ifndef strcasestr
-static char *
-strcasestr (char *haystack, char *needle)
-{
-	char *p, *startn = 0, *np = 0;
-
-	for (p = haystack; *p; p++) {
-		if (np) {
-			if (toupper(*p) == toupper(*np)) {
-				if (!*++np)
-					return startn;
-			} else
-				np = 0;
-		} else if (toupper(*p) == toupper(*needle)) {
-			np = needle + 1;
-			startn = p;
-		}
-	}
-
-	return 0;
-}
-#endif
-
-
 /* 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/hildon-thumbnail-daemon.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2008-11-17 10:16:16 UTC (rev 16691)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2008-11-17 12:40:13 UTC (rev 16692)
@@ -230,7 +230,7 @@
 static void
 on_outputplugin_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data)
 {
-	Thumbnailer *thumbnailer = user_data;
+	/* Thumbnailer *thumbnailer = user_data; */
 	gchar *path = g_file_get_path (file);
 
 	if (path && g_str_has_suffix (path, "." G_MODULE_SUFFIX)) {

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-17 10:16:16 UTC (rev 16691)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-17 12:40:13 UTC (rev 16692)
@@ -96,7 +96,6 @@
 						   const gchar *uri)
 {
 	GList *copy = g_list_copy (outplugs);
-	GQuark domain;
 	gboolean retval = FALSE;
 
 	g_static_rec_mutex_lock (&mutex);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-17 10:16:16 UTC (rev 16691)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-17 12:40:13 UTC (rev 16692)
@@ -34,6 +34,7 @@
 
 #include <string.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib-bindings.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -145,8 +146,6 @@
 reload_config (const gchar *config) 
 {
 	GKeyFile *keyfile;
-	GStrv mimetypes;
-	guint i = 0, length;
 	GError *error = NULL;
 
 	keyfile = g_key_file_new ();

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2008-11-17 10:16:16 UTC (rev 16691)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2008-11-17 12:40:13 UTC (rev 16692)
@@ -34,6 +34,7 @@
 
 #include <string.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib-bindings.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -145,7 +146,7 @@
 					   NULL, NULL);
 
 
-	g_sprintf (mtime_str, "%lu", mtime);
+	g_sprintf (mtime_str, "%Lu", mtime);
 
 	gdk_pixbuf_savev (pixbuf, filen, "png", 
 			  (char **) default_keys, 
@@ -171,8 +172,6 @@
 reload_config (const gchar *config) 
 {
 	GKeyFile *keyfile;
-	GStrv mimetypes;
-	guint i = 0, length;
 	GError *error = NULL;
 
 	keyfile = g_key_file_new ();

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-17 10:16:16 UTC (rev 16691)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-11-17 12:40:13 UTC (rev 16692)
@@ -79,8 +79,6 @@
 } VideoThumbnailer;
 
 
-static gboolean callback_bus(GstBus *bus, GstMessage *message, VideoThumbnailer *thumber);
-
 #ifndef g_sprintf
 gint                g_sprintf                           (gchar *string,
                                                          gchar const *format,
@@ -285,7 +283,6 @@
 static void
 video_thumbnail_create (VideoThumbnailer *thumber, GError **error)
 {
-	GstBus            *bus;
 	GstPad            *videopad;
 	GstCaps           *caps;
 	GTimeVal           timev;
@@ -458,9 +455,6 @@
 hildon_thumbnail_plugin_create (GStrv uris, gchar *mime_hint, GStrv *failed_uris, GError **error)
 {
 	VideoThumbnailer *thumber;
-	gchar *large    = NULL;
-	gchar *normal   = NULL;
-	gchar *cropped  = NULL;
 	guint i         = 0;
 	GString *errors = NULL;
 	GList *failed   = NULL;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-11-17 10:16:16 UTC (rev 16691)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-11-17 12:40:13 UTC (rev 16692)
@@ -28,6 +28,7 @@
 #endif
 
 #include <string.h>
+#include <ctype.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
@@ -293,9 +294,6 @@
 	dbus_g_method_return (context, num);
 }
 
-
-
-
 #ifndef strcasestr
 static char *
 strcasestr (char *haystack, char *needle)

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2008-11-17 10:16:16 UTC (rev 16691)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2008-11-17 12:40:13 UTC (rev 16692)
@@ -381,7 +381,6 @@
 hildon_thumbnail_request_finalize (GObject *object)
 {
 	HildonThumbnailRequestPrivate *r_priv = REQUEST_GET_PRIVATE (object);
-	guint i;
 
 	if (r_priv->uris)
 		g_strfreev (r_priv->uris);


