From 88be323e4a2214d4a28315c5da1e10197d1df4e1 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Sat, 16 May 2009 11:22:20 +0100 Subject: [PATCH] dbus: Use org.naquadah.awesome instead of org.awesome. http://dbus.freedesktop.org/doc/dbus-specification.html#naming-conventions Signed-off-by: Jonny Lamb Signed-off-by: Julien Danjou --- dbus.c | 3 +-- lib/awful/remote.lua.in | 4 ++-- utils/awesome-client | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dbus.c b/dbus.c index 0cd8fd70..e5b5820e 100644 --- a/dbus.c +++ b/dbus.c @@ -541,8 +541,7 @@ a_dbus_bus_getbyname(const char *name, size_t len) * \return The number of elements pushed on stack. * \luastack * \lparam A string indicating if we are using system or session bus. - * \lparam A string with the name of the D-Bus name to register. Note that - * org.awesome is registered by default. + * \lparam A string with the name of the D-Bus name to register. * \lreturn True if everything worked fine, false otherwise. */ static int diff --git a/lib/awful/remote.lua.in b/lib/awful/remote.lua.in index b604f076..86e32f81 100644 --- a/lib/awful/remote.lua.in +++ b/lib/awful/remote.lua.in @@ -18,8 +18,8 @@ local type = type module("awful.remote") if hooks.dbus then - dbus.request_name("session", "org.awesome") - hooks.dbus.register("org.awesome.Remote", function(data, code) + dbus.request_name("session", "org.naquadah.awesome") + hooks.dbus.register("org.naquadah.awesome.Remote", function(data, code) if data.member == "Eval" then local f, e = loadstring(code) if f then diff --git a/utils/awesome-client b/utils/awesome-client index 4daa64eb..a5fd4779 100755 --- a/utils/awesome-client +++ b/utils/awesome-client @@ -31,9 +31,9 @@ then exit 1 fi -DBUS_METHOD=org.awesome.Remote.Eval +DBUS_METHOD=org.naquadah.awesome.Remote.Eval DBUS_PATH=/ -DBUS_DEST=org.awesome +DBUS_DEST=org.naquadah.awesome a_dbus_send() {