[Xfce4-commits] <thunar:master> Switch back to org.freedesktop.thumbnails.* with API versioning.

[Jannis Pohlmann]

Updating branch refs/heads/master
         to 4e5231e8d7bb627ee85fe3cfaaa4e27137b3f073 (commit)
       from faec4c42a7a2e5efd2252a60f78c414f92d850be (commit)

commit 4e5231e8d7bb627ee85fe3cfaaa4e27137b3f073
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Tue Oct 6 21:26:55 2009 +0200

    Switch back to org.freedesktop.thumbnails.* with API versioning.

 thunar/Makefile.am                         |    4 ++--
 thunar/thunar-thumbnailer-dbus.xml         |    5 +++--
 thunar/thunar-thumbnailer-manager-dbus.xml |    4 ++--
 thunar/thunar-thumbnailer.c                |   15 ++++++++-------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 2516929..ee62564 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -332,13 +332,13 @@ thunar-dbus-service-infos.h: $(srcdir)/thunar-dbus-service-infos.xml Makefile
 thunar-thumbnailer-proxy.h: $(srcdir)/thunar-thumbnailer-dbus.xml Makefile
 	dbus-binding-tool --mode=glib-client \
 		$(srcdir)/thunar-thumbnailer-dbus.xml > thunar-thumbnailer-proxy.h \
-	&& sed -i -e 's/org_xfce_thumbnails_Thumbnailer/thunar_thumbnailer_proxy/g' \
+	&& sed -i -e 's/org_freedesktop_thumbnails_Thumbnailer1/thunar_thumbnailer_proxy/g' \
 		thunar-thumbnailer-proxy.h
 
 thunar-thumbnailer-manager-proxy.h: $(srcdir)/thunar-thumbnailer-manager-dbus.xml Makefile
 	dbus-binding-tool --mode=glib-client \
 		$(srcdir)/thunar-thumbnailer-manager-dbus.xml > thunar-thumbnailer-manager-proxy.h \
-	&& sed -i -e 's/org_xfce_thumbnails_Manager/thunar_thumbnailer_manager_proxy/g' \
+	&& sed -i -e 's/org_freedesktop_thumbnails_Manager1/thunar_thumbnailer_manager_proxy/g' \
 		thunar-thumbnailer-manager-proxy.h
 endif
 
diff --git a/thunar/thunar-thumbnailer-dbus.xml b/thunar/thunar-thumbnailer-dbus.xml
index c040ceb..84ecb65 100644
--- a/thunar/thunar-thumbnailer-dbus.xml
+++ b/thunar/thunar-thumbnailer-dbus.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<node name="/org/xfce/thumbnails/Thumbnailer">
-  <interface name="org.xfce.thumbnails.Thumbnailer">
+<node name="/org/freedesktop/thumbnails/Thumbnailer1">
+  <interface name="org.freedesktop.thumbnails.Thumbnailer1">
     <method name="Queue">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="as" name="uris" direction="in" />
       <arg type="as" name="mime_hints" direction="in" />
+      <arg type="s" name="scheduler" direction="in" />
       <arg type="u" name="handle_to_unqueue" direction="in" />
       <arg type="u" name="handle" direction="out" />
     </method>
diff --git a/thunar/thunar-thumbnailer-manager-dbus.xml b/thunar/thunar-thumbnailer-manager-dbus.xml
index cfc3fef..e104b4f 100644
--- a/thunar/thunar-thumbnailer-manager-dbus.xml
+++ b/thunar/thunar-thumbnailer-manager-dbus.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<node name="/org/xfce/thumbnails/Manager">
-  <interface name="org.xfce.thumbnails.Manager">
+<node name="/org/freedesktop/thumbnails/Manager1">
+  <interface name="org.freedesktop.thumbnails.Manager1">
     <method name="Register">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="s" name="uri_scheme" direction="in" />
diff --git a/thunar/thunar-thumbnailer.c b/thunar/thunar-thumbnailer.c
index e81cbaf..6a6314e 100644
--- a/thunar/thunar-thumbnailer.c
+++ b/thunar/thunar-thumbnailer.c
@@ -415,9 +415,9 @@ thunar_thumbnailer_init_thumbnailer_proxy (ThunarThumbnailer *thumbnailer,
       /* create the shared thumbnailer proxy */
       thunar_thumbnailer_proxy = 
         dbus_g_proxy_new_for_name (connection, 
-                                   "org.xfce.thumbnails.Thumbnailer",
-                                   "/org/xfce/thumbnails/Thumbnailer",
-                                   "org.xfce.thumbnails.Thumbnailer");
+                                   "org.freedesktop.thumbnails.Thumbnailer1",
+                                   "/org/freedesktop/thumbnails/Thumbnailer1",
+                                   "org.freedesktop.thumbnails.Thumbnailer1");
 
       /* make sure to set it to NULL when the last reference is dropped */
       g_object_add_weak_pointer (G_OBJECT (thunar_thumbnailer_proxy),
@@ -487,9 +487,9 @@ thunar_thumbnailer_init_manager_proxy (ThunarThumbnailer *thumbnailer,
       /* create the shared manager proxy */
       thunar_thumbnailer_manager_proxy = 
         dbus_g_proxy_new_for_name (connection, 
-                                   "org.xfce.thumbnails.Manager",
-                                   "/org/xfce/thumbnails/Manager",
-                                   "org.xfce.thumbnails.Manager");
+                                   "org.freedesktop.thumbnails.Manager1",
+                                   "/org/freedesktop/thumbnails/Manager1",
+                                   "org.freedesktop.thumbnails.Manager1");
 
       /* make sure to set it to NULL when the last reference is dropped */
       g_object_add_weak_pointer (G_OBJECT (thunar_thumbnailer_manager_proxy),
@@ -783,7 +783,8 @@ thunar_thumbnailer_queue_async (ThunarThumbnailer *thumbnailer,
 
   /* queue thumbnails for the given URIs asynchronously */
   call = thunar_thumbnailer_proxy_queue_async (thumbnailer->thumbnailer_proxy,
-                                               (const gchar **)uris, mime_hints, 0, 
+                                               (const gchar **)uris, mime_hints, 
+                                               "foreground", 0, 
                                                thunar_thumbnailer_queue_async_reply,
                                                thumbnailer_call);