[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. 23a3c55c5152977a0f4addcce9f5d4085a8105a4

[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  e7b9da320993840f21f6208ba8a209865fca37ab (commit)

- Log -----------------------------------------------------------------
23a3c55... hide start-pulseaudio-x11
888256b... reset dbus error struct before retrying parsing messages
-----------------------------------------------------------------------

Summary of changes:
 src/.gitignore                   |    1 +
 src/modules/module-console-kit.c |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)

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

commit 888256b0be254f20e291ffdec8b109fb0ada4dd0
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jul 24 01:31:33 2008 +0200

    reset dbus error struct before retrying parsing messages

diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
index 5a3975f..829b43b 100644
--- a/src/modules/module-console-kit.c
+++ b/src/modules/module-console-kit.c
@@ -94,6 +94,8 @@ static void add_session(struct userdata *u, const char *id) {
 
     /* CK 0.3 this changed from int32 to uint32 */
     if (!dbus_message_get_args(reply, &error, DBUS_TYPE_UINT32, &uid, DBUS_TYPE_INVALID)) {
+        dbus_error_free(&error);
+
         if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID)) {
             pa_log("Failed to parse GetUnixUser() result: %s: %s", error.name, error.message);
             goto fail;
@@ -167,6 +169,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
 
         /* CK API changed to match spec in 0.3 */
         if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) {
+            dbus_error_free(&error);
+
             if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) {
                 pa_log_error("Failed to parse SessionAdded message: %s: %s", error.name, error.message);
                 goto finish;
@@ -179,6 +183,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
 
         /* CK API changed to match spec in 0.3 */
         if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) {
+            dbus_error_free(&error);
+
             if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) {
                 pa_log_error("Failed to parse SessionRemoved message: %s: %s", error.name, error.message);
                 goto finish;

commit 23a3c55c5152977a0f4addcce9f5d4085a8105a4
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jul 24 01:32:00 2008 +0200

    hide start-pulseaudio-x11

diff --git a/src/.gitignore b/src/.gitignore
index f3ed2e2..33a9f25 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -54,3 +54,4 @@ thread-mainloop-test
 thread-test
 utf8-test
 voltest
+start-pulseaudio-x11

-- 
hooks/post-receive
PulseAudio Sound Server