[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test5-118-gb6135b3

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  857a1f4909f91fbf504ad05aca4b0dcd7945cacf (commit)

- Log -----------------------------------------------------------------
b6135b3 minor cleanups
3df9eef take org.pulseaudio.Server instead of org.pulseaudio to match the interface name already used in the HAL module
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/main.c   |    6 +++---
 src/pulse/context.c |   16 ++++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------

commit 3df9eef9d0deb4f5216d024163fe966befeca908
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Mar 30 21:07:23 2009 +0200

    take org.pulseaudio.Server instead of org.pulseaudio to match the interface name already used in the HAL module

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 1d54348..2faf650 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -345,10 +345,10 @@ static void register_org_pulseaudio(pa_core *c)
         goto finish_dbus;
     }
 
-    if (dbus_bus_request_name (pa_dbus_connection_get(conn), "org.pulseaudio", 0, &error) == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
-        pa_log_debug("Got org.pulseaudio!");
+    if (dbus_bus_request_name (pa_dbus_connection_get(conn), "org.pulseaudio.Server", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error) == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
+        pa_log_debug("Got org.pulseaudio.Server!");
     else if (dbus_error_is_set(&error))
-        pa_log_warn("Unable to get org.pulseaudio: %s: %s", error.name, error.message);
+        pa_log_warn("Unable to get org.pulseaudio.Server: %s: %s", error.name, error.message);
 
 finish_dbus:
     if (conn)
diff --git a/src/pulse/context.c b/src/pulse/context.c
index 9fb9e72..40fa808 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -760,8 +760,8 @@ static void track_pulseaudio_on_dbus(pa_context *c, DBusBusType type, pa_dbus_wr
 
     if (pa_dbus_add_matches(
                 pa_dbus_wrap_connection_get(*conn), &error,
-                "type='signal',sender='" DBUS_SERVICE_DBUS "',interface='" DBUS_INTERFACE_DBUS "',member='NameOwnerChanged',arg0='org.pulseaudio',arg1=''", NULL) < 0)
-        pa_log_warn("Unable to track org.pulseaudio: %s: %s", error.name, error.message);
+                "type='signal',sender='" DBUS_SERVICE_DBUS "',interface='" DBUS_INTERFACE_DBUS "',member='NameOwnerChanged',arg0='org.pulseaudio.Server',arg1=''", NULL) < 0)
+        pa_log_warn("Unable to track org.pulseaudio.Server: %s: %s", error.name, error.message);
 
  finish:
     dbus_error_free(&error);

commit b6135b34b3d8a9ff04cdf4359d33b54f97823037
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Mar 30 21:07:41 2009 +0200

    minor cleanups

diff --git a/src/pulse/context.c b/src/pulse/context.c
index 40fa808..13b6d57 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -874,16 +874,20 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
     if (c->state != PA_CONTEXT_CONNECTING)
         goto finish;
 
+    if (!c->no_fail)
+        goto finish;
+
+    /* FIXME: We probably should check if this is actually the NameOwnerChanged we were looking for */
+
     is_session = bus == pa_dbus_wrap_connection_get(c->session_bus);
-    pa_log_debug("Rock!! PulseAudio is baack on %s bus", is_session ? "session" : "system");
+    pa_log_debug("Rock!! PulseAudio is back on %s bus", is_session ? "session" : "system");
 
-    if (is_session) {
+    if (is_session)
         /* The user instance via PF_LOCAL */
         c->server_list = prepend_per_user(c->server_list);
-    } else {
+    else
         /* The system wide instance via PF_LOCAL */
         c->server_list = pa_strlist_prepend(c->server_list, PA_SYSTEM_RUNTIME_PATH PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET);
-    }
 
     try_next_connection(c);
 

-- 
hooks/post-receive
PulseAudio Sound Server