summaryrefslogtreecommitdiffstats
path: root/src/daemon/server-lookup.c
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2009-06-19 10:28:08 +0300
committerTanu Kaskinen <tanuk@iki.fi>2009-06-19 10:28:08 +0300
commit123c6a3c6ffc9903c0855e38445fc3b6588311ce (patch)
tree7bc96612da587da6c522ed46b1d26a12f10dd8f4 /src/daemon/server-lookup.c
parentc8d819a5adbe32e14d7f03a252bca6f7df01d795 (diff)
dbus-common: Implement infrastructure for registering D-Bus objects on all
client connections and for receiving method calls from clients.
Diffstat (limited to 'src/daemon/server-lookup.c')
-rw-r--r--src/daemon/server-lookup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c
index b53fda76..2d2d8ce6 100644
--- a/src/daemon/server-lookup.c
+++ b/src/daemon/server-lookup.c
@@ -48,7 +48,7 @@ static const char introspection[] =
" <!-- If you are looking for documentation make sure to check out\n"
" http://pulseaudio.org/wiki/DBusInterface -->\n"
" <interface name=\"org.pulseaudio.ServerLookup\">"
- " <method name=\"GetDBusAddress\">"
+ " <method name=\"GetAddress\">"
" <arg name=\"result\" type=\"s\" direction=\"out\"/>"
" </method>"
" </interface>"
@@ -101,7 +101,7 @@ oom:
return DBUS_HANDLER_RESULT_NEED_MEMORY;
}
-static DBusHandlerResult handle_get_dbus_address(DBusConnection *conn, DBusMessage *msg, pa_dbusobj_server_lookup *sl) {
+static DBusHandlerResult handle_get_address(DBusConnection *conn, DBusMessage *msg, pa_dbusobj_server_lookup *sl) {
DBusMessage *reply = NULL;
pa_client_conf *conf = NULL;
char *address = NULL;
@@ -187,8 +187,8 @@ static DBusHandlerResult message_cb(DBusConnection *conn, DBusMessage *msg, void
if (dbus_message_is_method_call(msg, "org.freedesktop.DBus.Introspectable", "Introspect"))
return handle_introspect(conn, msg, sl);
- if (dbus_message_is_method_call(msg, "org.pulseaudio.ServerLookup", "GetDBusAddress"))
- return handle_get_dbus_address(conn, msg, sl);
+ if (dbus_message_is_method_call(msg, "org.pulseaudio.ServerLookup", "GetAddress"))
+ return handle_get_address(conn, msg, sl);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}