diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-25 11:03:22 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-25 14:57:08 +0000 |
| commit | 475f5f7ce5e7d16d2ad4e778475d6dea3d556b80 (patch) | |
| tree | a4f4147394ae9c7141d91eb60ffb5f3ef78687aa | |
| parent | 7f112ac3d429275ec6f62cbfe8b3cf7c76a927ca (diff) | |
Update Logger bus name, object path and interface name for Telepathy-1
Yes, the interface name is ...Logger1, while the bus name is ...Logger;
that's not a typo.
Reviewed-by: Xavier Claessens
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=708871
| -rw-r--r-- | backends/telepathy/lib/tpf-logger.vala | 6 | ||||
| -rw-r--r-- | tests/lib/telepathy/contactlist/backend.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/backends/telepathy/lib/tpf-logger.vala b/backends/telepathy/lib/tpf-logger.vala index 2be81aed..fd7b6151 100644 --- a/backends/telepathy/lib/tpf-logger.vala +++ b/backends/telepathy/lib/tpf-logger.vala @@ -29,7 +29,7 @@ private struct AccountFavourites string[] ids; } -[DBus (name = "org.freedesktop.Telepathy.Logger.DRAFT")] +[DBus (name = "im.telepathy.v1.Logger1")] private interface LoggerIface : Object { public abstract async AccountFavourites[] get_favourite_contacts () @@ -98,8 +98,8 @@ internal class Logger : GLib.Object /* Create a logger proxy for favourites support */ var dbus_conn = yield Bus.get (BusType.SESSION); Logger._logger = yield dbus_conn.get_proxy<LoggerIface> ( - "org.freedesktop.Telepathy.Logger", - "/org/freedesktop/Telepathy/Logger"); + "im.telepathy.v1.Logger", + "/im/telepathy/v1/Logger"); if (Logger._logger != null) { diff --git a/tests/lib/telepathy/contactlist/backend.c b/tests/lib/telepathy/contactlist/backend.c index 7e1cb0ef..1c9404a1 100644 --- a/tests/lib/telepathy/contactlist/backend.c +++ b/tests/lib/telepathy/contactlist/backend.c @@ -94,7 +94,7 @@ _log_should_suppress (const char *domain, /* Ignore the error caused by not running the logger through dbus-glib */ suppress |= g_str_has_suffix (message, - "The name org.freedesktop.Telepathy.Logger was not provided by any " + "The name im.telepathy.v1.Logger was not provided by any " ".service files"); /* And again for GDBus */ |