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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2009-05-27 11:39:17 +0300 (Wed, 27 May 2009)
New Revision: 18501

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
Log:
Bugfix for a crash reported by mail

Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-27 07:38:41 UTC (rev 18500)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-27 08:39:17 UTC (rev 18501)
@@ -1,3 +1,7 @@
+2009-05-25  Philip Van Hoof  <philip at codeminded.be>
+
+	* Bugfix for a crash reported by mail
+
 2009-05-26  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 3.0.28

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2009-05-27 07:38:41 UTC (rev 18500)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2009-05-27 08:39:17 UTC (rev 18501)
@@ -43,7 +43,7 @@
 	GStrv uris;
 	gchar *key;
 	guint width, height;
-	gboolean cropped;
+	gboolean cropped, unqueued;
 	HildonThumbnailRequestPixbufCallback pcallback;
 	HildonThumbnailRequestUriCallback ucallback;
 	GDestroyNotify destroy;
@@ -365,6 +365,7 @@
 	r_priv->uris = NULL;
 	r_priv->key = NULL;
 	r_priv->cropped = FALSE;
+	r_priv->unqueued = FALSE;
 	r_priv->factory = NULL;
 	r_priv->pcallback = NULL;
 	r_priv->ucallback = NULL;
@@ -606,11 +607,16 @@
 {
 	HildonThumbnailRequestPrivate *r_priv = REQUEST_GET_PRIVATE (self);
 	HildonThumbnailFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (r_priv->factory);
-	guint handle = atoi (r_priv->key);
+	guint handle;
 
-	org_freedesktop_thumbnailer_Generic_unqueue_async (f_priv->proxy, handle,
-							   on_unqueued, 
-							   g_object_ref (self));
+	if (r_priv && r_priv->key) {
+		handle = atoi (r_priv->key);
+		org_freedesktop_thumbnailer_Generic_unqueue_async (f_priv->proxy, handle,
+								   on_unqueued, 
+								   g_object_ref (self));
+	}
+
+	r_priv->unqueued = TRUE;
 }
 
 void