Updating branch refs/heads/master to abcebdf3a33db65061003f923a0eedbe7be50269 (commit) from bb8928cb7423a1634f444411d7dbc6e4ea0601ef (commit)
commit abcebdf3a33db65061003f923a0eedbe7be50269 Author: Jannis Pohlmann <jan...@xfce.org> Date: Tue Oct 6 21:16:56 2009 +0200 Back to the org.freedesktop.thumbnails namespace. Use API versioning. This is another in a series of commits aiming at synchronizing the implemented D-Bus API with the changes recently made to the spec on http://live.gnome.org/ThumbnailerSpec. We now append an API version to the D-Bus interface and object path names. We also use org.freedesktop.thumbnails.SpecializedThumbnailer for specialized thumbnailers, as we do not need to use another namespace (previously org.freedesktop.thumbnailer.Thumbnailer was used) for it. tumblerd/tumbler-cache-service-dbus.xml | 4 ++-- tumblerd/tumbler-cache-service.c | 4 ++-- tumblerd/tumbler-manager-dbus.xml | 4 ++-- tumblerd/tumbler-manager.c | 4 ++-- tumblerd/tumbler-service-dbus.xml | 4 ++-- tumblerd/tumbler-service.c | 8 ++------ tumblerd/tumbler-specialized-thumbnailer.c | 9 +++++---- 7 files changed, 17 insertions(+), 20 deletions(-) diff --git a/tumblerd/tumbler-cache-service-dbus.xml b/tumblerd/tumbler-cache-service-dbus.xml index c72acb5..0d4ca87 100644 --- a/tumblerd/tumbler-cache-service-dbus.xml +++ b/tumblerd/tumbler-cache-service-dbus.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<node name="/org/xfce/thumbnails/Cache"> - <interface name="org.xfce.thumbnails.Cache"> +<node name="/org/freedesktop/thumbnails/Cache1"> + <interface name="org.freedesktop.thumbnails.Cache1"> <method name="Move"> <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/> <arg type="as" name="from_uris" direction="in" /> diff --git a/tumblerd/tumbler-cache-service.c b/tumblerd/tumbler-cache-service.c index ffdfcb5..4961fcd 100644 --- a/tumblerd/tumbler-cache-service.c +++ b/tumblerd/tumbler-cache-service.c @@ -382,7 +382,7 @@ tumbler_cache_service_start (TumblerCacheService *service, connection = dbus_g_connection_get_connection (service->connection); /* request ownership for the cache interface */ - result = dbus_bus_request_name (connection, "org.xfce.thumbnails.Cache", + result = dbus_bus_request_name (connection, "org.freedesktop.thumbnails.Cache1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &dbus_error); /* check if that failed */ @@ -413,7 +413,7 @@ tumbler_cache_service_start (TumblerCacheService *service, /* register the cache instance as a handler of the cache interface */ dbus_g_connection_register_g_object (service->connection, - "/org/xfce/thumbnails/Cache", + "/org/freedesktop/thumbnails/Cache1", G_OBJECT (service)); g_mutex_unlock (service->mutex); diff --git a/tumblerd/tumbler-manager-dbus.xml b/tumblerd/tumbler-manager-dbus.xml index cfc3fef..e104b4f 100644 --- a/tumblerd/tumbler-manager-dbus.xml +++ b/tumblerd/tumbler-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/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c index 13f37f3..14502ef 100644 --- a/tumblerd/tumbler-manager.c +++ b/tumblerd/tumbler-manager.c @@ -210,7 +210,7 @@ tumbler_manager_start (TumblerManager *manager, connection = dbus_g_connection_get_connection (manager->connection); /* request ownership for the manager interface */ - result = dbus_bus_request_name (connection, "org.xfce.thumbnails.Manager", + result = dbus_bus_request_name (connection, "org.freedesktop.thumbnails.Manager1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &dbus_error); /* check if that failed */ @@ -242,7 +242,7 @@ tumbler_manager_start (TumblerManager *manager, /* register the manager instance as a handler of the manager interface */ dbus_g_connection_register_g_object (manager->connection, - "/org/xfce/thumbnails/Manager", + "/org/freedesktop/thumbnails/Manager1", G_OBJECT (manager)); g_mutex_unlock (manager->mutex); diff --git a/tumblerd/tumbler-service-dbus.xml b/tumblerd/tumbler-service-dbus.xml index 26adbfc..0026e6c 100644 --- a/tumblerd/tumbler-service-dbus.xml +++ b/tumblerd/tumbler-service-dbus.xml @@ -1,6 +1,6 @@ <?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" /> diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c index 40b7420..9890407 100644 --- a/tumblerd/tumbler-service.c +++ b/tumblerd/tumbler-service.c @@ -389,7 +389,7 @@ tumbler_service_start (TumblerService *service, connection = dbus_g_connection_get_connection (service->connection); /* request ownership for the generic thumbnailer interface */ - result = dbus_bus_request_name (connection, "org.freedesktop.thumbnails.Thumbnailer", + result = dbus_bus_request_name (connection, "org.freedesktop.thumbnails.Thumbnailer1", DBUS_NAME_FLAG_DO_NOT_QUEUE, &dbus_error); /* check if that failed */ @@ -420,7 +420,7 @@ tumbler_service_start (TumblerService *service, /* register the service instance as a handler of this interface */ dbus_g_connection_register_g_object (service->connection, - "/org/freedesktop/thumbnails/Thumbnailer", + "/org/freedesktop/thumbnails/Thumbnailer1", G_OBJECT (service)); g_mutex_unlock (service->mutex); @@ -446,8 +446,6 @@ tumbler_service_queue (TumblerService *service, guint handle; gint num_thumbnailers; - g_debug ("tumbler_service_queue:"); - dbus_async_return_if_fail (TUMBLER_IS_SERVICE (service), context); dbus_async_return_if_fail (uris != NULL, context); dbus_async_return_if_fail (mime_hints != NULL, context); @@ -456,8 +454,6 @@ tumbler_service_queue (TumblerService *service, if (desired_scheduler == NULL || *desired_scheduler == '\0') desired_scheduler = "default"; - g_debug ("%s", desired_scheduler); - g_mutex_lock (service->mutex); /* get an array with one thumbnailer for each URI in the request */ diff --git a/tumblerd/tumbler-specialized-thumbnailer.c b/tumblerd/tumbler-specialized-thumbnailer.c index b353fc2..ca122a2 100644 --- a/tumblerd/tumbler-specialized-thumbnailer.c +++ b/tumblerd/tumbler-specialized-thumbnailer.c @@ -189,10 +189,11 @@ tumbler_specialized_thumbnailer_constructed (GObject *object) bus_path = g_strdup_printf ("/%s", thumbnailer->name); bus_path = g_strdelimit (bus_path, ".", '/'); - thumbnailer->proxy = dbus_g_proxy_new_for_name (thumbnailer->connection, - thumbnailer->name, - bus_path, - "org.xfce.thumbnailer.Thumbnailer"); + thumbnailer->proxy = + dbus_g_proxy_new_for_name (thumbnailer->connection, + thumbnailer->name, + bus_path, + "org.freedesktop.thumbnails.SpecializedThumbnailer1"); g_free (bus_path); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits