[maemo-commits] [maemo-commits] r15981 - projects/haf/branches/hildon-thumbnail/daemonize/daemon

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-09-03 13:45:06 +0300 (Wed, 03 Sep 2008)
New Revision: 15981

Modified:
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.xml
Log:
Adapted to new spec

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c	2008-09-03 10:05:21 UTC (rev 15980)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.c	2008-09-03 10:45:06 UTC (rev 15981)
@@ -38,6 +38,7 @@
 
 enum {
 	STARTED_SIGNAL,
+	FINISHED_SIGNAL,
 	READY_SIGNAL,
 	ERROR_SIGNAL,
 	LAST_SIGNAL
@@ -301,12 +302,15 @@
 
 	if (!had_error)
 		g_signal_emit (task->object, signals[READY_SIGNAL], 0,
-			       task->num);
+			       task->urls);
 	else
 		g_hash_table_foreach (hash, cleanup_hash, NULL);
 
 	g_hash_table_unref (hash);
 
+	g_signal_emit (task->object, signals[FINISHED_SIGNAL], 0,
+			       task->num);
+
 unqueued:
 
 	/* task->context will always be returned by now */
@@ -433,10 +437,10 @@
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ThumbnailerClass, ready),
 			      NULL, NULL,
-			      g_cclosure_marshal_VOID__UINT,
+			      g_cclosure_marshal_VOID__BOXED,
 			      G_TYPE_NONE,
 			      1,
-			      G_TYPE_UINT);
+			      G_TYPE_STRV);
 
 	signals[STARTED_SIGNAL] =
 		g_signal_new ("Started",
@@ -449,6 +453,17 @@
 			      1,
 			      G_TYPE_UINT);
 
+	signals[FINISHED_SIGNAL] =
+		g_signal_new ("Finished",
+			      G_OBJECT_CLASS_TYPE (object_class),
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (ThumbnailerClass, finished),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__UINT,
+			      G_TYPE_NONE,
+			      1,
+			      G_TYPE_UINT);
+	
 	signals[ERROR_SIGNAL] =
 		g_signal_new ("Error",
 			      G_OBJECT_CLASS_TYPE (object_class),

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h	2008-09-03 10:05:21 UTC (rev 15980)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.h	2008-09-03 10:45:06 UTC (rev 15981)
@@ -24,6 +24,7 @@
 struct ThumbnailerClass {
 	GObjectClass parent;
 
+	void (*finished) (Thumbnailer *object, guint handle);
 	void (*started) (Thumbnailer *object, guint handle);
 	void (*ready) (Thumbnailer *object, guint handle);
 	void (*error) (Thumbnailer *object, guint handle, gchar *reason);

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.xml
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.xml	2008-09-03 10:05:21 UTC (rev 15980)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/thumbnailer.xml	2008-09-03 10:45:06 UTC (rev 15981)
@@ -17,10 +17,14 @@
       <arg type="u" name="handle" />
     </signal>
 
-    <signal name="Ready">
+    <signal name="Finished">
       <arg type="u" name="handle" />
     </signal>
 
+    <signal name="Ready">
+      <arg type="as" name="uris" />
+    </signal>
+
     <signal name="Error">
       <arg type="u" name="handle" />
       <arg type="s" name="reason" />