Updating branch refs/heads/master
to f7fb6233b853e906abeefa8d160d89dbe99e5d9c (commit)
from bb7bd714867f89dfb0007120fca7932a9af0a3e6 (commit)
commit f7fb6233b853e906abeefa8d160d89dbe99e5d9c
Author: Jannis Pohlmann <jan...@xfce.org>
Date: Wed Sep 30 02:23:34 2009 +0200
Use org.xfce and /org/xfce prefixes instead of freedesktop ones.
The thumbnail management D-Bus specification is by far not offical yet,
so for now it's better to use our own namespace to avoid collisions with
possible future thumbnail service namespaces accepted by fd.o.
thunar/Makefile.am | 4 ++--
thunar/thunar-thumbnailer-dbus.xml | 4 ++--
thunar/thunar-thumbnailer-manager-dbus.xml | 4 ++--
thunar/thunar-thumbnailer.c | 12 ++++++------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index b286fc5..2516929 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_freedesktop_thumbnails_Thumbnailer/thunar_thumbnailer_proxy/g' \
+ && sed -i -e
's/org_xfce_thumbnails_Thumbnailer/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_freedesktop_thumbnails_Manager/thunar_thumbnailer_manager_proxy/g' \
+ && sed -i -e
's/org_xfce_thumbnails_Manager/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 ebd1e58..c040ceb 100644
--- a/thunar/thunar-thumbnailer-dbus.xml
+++ b/thunar/thunar-thumbnailer-dbus.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<node name="/org/freedesktop/thumbnails/Thumbnailer">
- <interface name="org.freedesktop.thumbnails.Thumbnailer">
+<node name="/org/xfce/thumbnails/Thumbnailer">
+ <interface name="org.xfce.thumbnails.Thumbnailer">
<method name="Queue">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
<arg type="as" name="uris" direction="in" />
diff --git a/thunar/thunar-thumbnailer-manager-dbus.xml
b/thunar/thunar-thumbnailer-manager-dbus.xml
index 7ce682b..cfc3fef 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/freedesktop/thumbnails/Manager">
- <interface name="org.freedesktop.thumbnails.Manager">
+<node name="/org/xfce/thumbnails/Manager">
+ <interface name="org.xfce.thumbnails.Manager">
<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 b8c924f..e81cbaf 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.freedesktop.thumbnails.Thumbnailer",
- "/org/freedesktop/thumbnails/Thumbnailer",
- "org.freedesktop.thumbnails.Thumbnailer");
+ "org.xfce.thumbnails.Thumbnailer",
+ "/org/xfce/thumbnails/Thumbnailer",
+ "org.xfce.thumbnails.Thumbnailer");
/* 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.freedesktop.thumbnails.Manager",
- "/org/freedesktop/thumbnails/Manager",
- "org.freedesktop.thumbnails.Manager");
+ "org.xfce.thumbnails.Manager",
+ "/org/xfce/thumbnails/Manager",
+ "org.xfce.thumbnails.Manager");
/* make sure to set it to NULL when the last reference is dropped */
g_object_add_weak_pointer (G_OBJECT (thunar_thumbnailer_manager_proxy),
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
