[Xfce4-commits] <thunar:master> Synchronize with the latest changes in the ThumbnailerSpec and tumbler.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 8474b21004aa7d5a0df15591216e2a30966914ff (commit)
       from bee468d55f601ba4f9e2ec25f9bff1c0158e84ee (commit)

commit 8474b21004aa7d5a0df15591216e2a30966914ff
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Thu Oct 15 16:55:24 2009 +0200

    Synchronize with the latest changes in the ThumbnailerSpec and tumbler.

 thunar/thunar-thumbnailer-dbus.xml |    1 +
 thunar/thunar-thumbnailer.c        |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/thunar/thunar-thumbnailer-dbus.xml b/thunar/thunar-thumbnailer-dbus.xml
index d6ad2e9..8513f6a 100644
--- a/thunar/thunar-thumbnailer-dbus.xml
+++ b/thunar/thunar-thumbnailer-dbus.xml
@@ -35,6 +35,7 @@
     </signal>
 
     <signal name="Ready">
+      <arg type="u" name="handle" />
       <arg type="as" name="uris" />
     </signal>
 
diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c
index 97fc86f..94049d3 100644
--- a/thunar/thunar-thumbnailer.c
+++ b/thunar/thunar-thumbnailer.c
@@ -150,6 +150,7 @@ static void                   thunar_thumbnailer_thumbnailer_error      (DBusGPr
                                                                          const gchar           *message,
                                                                          ThunarThumbnailer     *thumbnailer);
 static void                   thunar_thumbnailer_thumbnailer_ready      (DBusGProxy            *proxy,
+                                                                         guint32                handle,
                                                                          const gchar          **uris,
                                                                          ThunarThumbnailer     *thumbnailer);
 static void                   thunar_thumbnailer_thumbnailer_started    (DBusGProxy            *proxy,
@@ -420,8 +421,9 @@ thunar_thumbnailer_init_thumbnailer_proxy (ThunarThumbnailer *thumbnailer,
                                          G_TYPE_STRING,
                                          G_TYPE_INVALID);
 
-      dbus_g_object_register_marshaller ((GClosureMarshal) g_cclosure_marshal_VOID__POINTER,
+      dbus_g_object_register_marshaller ((GClosureMarshal) g_cclosure_marshal_VOID__UINT_POINTER,
                                          G_TYPE_NONE,
+                                         G_TYPE_UINT,
                                          G_TYPE_STRV,
                                          G_TYPE_INVALID);
 
@@ -431,7 +433,7 @@ thunar_thumbnailer_init_thumbnailer_proxy (ThunarThumbnailer *thumbnailer,
       dbus_g_proxy_add_signal (thumbnailer->thumbnailer_proxy, "Finished", 
                                G_TYPE_UINT, G_TYPE_INVALID);
       dbus_g_proxy_add_signal (thumbnailer->thumbnailer_proxy, "Ready", 
-                               G_TYPE_STRV, G_TYPE_INVALID);
+                               G_TYPE_UINT, G_TYPE_STRV, G_TYPE_INVALID);
       dbus_g_proxy_add_signal (thumbnailer->thumbnailer_proxy, "Started", 
                                G_TYPE_UINT, G_TYPE_INVALID);
     }
@@ -587,6 +589,7 @@ thunar_thumbnailer_thumbnailer_finished (DBusGProxy        *proxy,
 
 static void
 thunar_thumbnailer_thumbnailer_ready (DBusGProxy        *proxy,
+                                      guint32            handle,
                                       const gchar      **uris,
                                       ThunarThumbnailer *thumbnailer)
 {