client-conf: Remove redundant function parameters

[pulseaudio] / src / daemon / server-lookup.c

diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c
index ebacc099d796f2f07556b8445a94d6bf888667d0..1f088e6de45de0617a8d95d477c52907ee61c480 100644 (file)
--- a/src/daemon/server-lookup.c
+++ b/src/daemon/server-lookup.c
@@ -30,19 +30,19 @@
 
 #include <pulsecore/core.h>
 #include <pulsecore/core-util.h>
-#include <pulsecore/dbus-common.h>
 #include <pulsecore/dbus-shared.h>
 #include <pulsecore/macro.h>
+#include <pulsecore/protocol-dbus.h>
 
 #include "server-lookup.h"
 
-#define OBJECT_PATH "/org/pulseaudio1/server_lookup"
+#define OBJECT_PATH "/org/pulseaudio/server_lookup1"
 #define INTERFACE "org.PulseAudio.ServerLookup1"
 
 struct pa_dbusobj_server_lookup {
     pa_core *core;
     pa_dbus_connection *conn;
-    pa_bool_t path_registered;
+    bool path_registered;
 };
 
 static const char introspection[] =
@@ -82,7 +82,7 @@ static void unregister_cb(DBusConnection *conn, void *user_data) {
     pa_assert(sl);
     pa_assert(sl->path_registered);
 
-    sl->path_registered = FALSE;
+    sl->path_registered = false;
 }
 
 static DBusHandlerResult handle_introspect(DBusConnection *conn, DBusMessage *msg, pa_dbusobj_server_lookup *sl) {
@@ -126,7 +126,7 @@ static enum get_address_result_t get_address(pa_server_type_t server_type, char
 
     *address = NULL;
 
-    if (pa_client_conf_load(conf, NULL) < 0) {
+    if (pa_client_conf_load(conf) < 0) {
         r = FAILED_TO_LOAD_CLIENT_CONF;
         goto finish;
     }
@@ -482,10 +482,10 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) {
 
     sl = pa_xnew(pa_dbusobj_server_lookup, 1);
     sl->core = c;
-    sl->path_registered = FALSE;
+    sl->path_registered = false;
 
     if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
-        pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message);
+        pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message);
         goto fail;
     }
 
@@ -494,7 +494,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) {
         goto fail;
     }
 
-    sl->path_registered = TRUE;
+    sl->path_registered = true;
 
     return sl;