diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-16 21:25:48 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-16 21:25:48 +0300 |
| commit | bcaba0b1b43d6a1b32aadfa98860f40b2c93e136 (patch) | |
| tree | 6bd0d60a8fa822bfd688b90d062d0f73eee2e47e /src/pulsecore/dbus-util.c | |
| parent | 2bb3eef414f80189cf6af6cd66c519630e4c0a43 (diff) | |
| parent | 01e4b61a910afdd21f860fadbe98075735c2bf51 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts:
src/Makefile.am
src/daemon/daemon-conf.c
src/daemon/daemon.conf.in
src/modules/module-stream-restore.c
src/pulse/client-conf.c
src/pulsecore/namereg.c
Diffstat (limited to 'src/pulsecore/dbus-util.c')
| -rw-r--r-- | src/pulsecore/dbus-util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulsecore/dbus-util.c b/src/pulsecore/dbus-util.c index 903acadb7..b45e6a6c6 100644 --- a/src/pulsecore/dbus-util.c +++ b/src/pulsecore/dbus-util.c @@ -667,7 +667,7 @@ void pa_dbus_append_proplist(DBusMessageIter *iter, pa_proplist *proplist) { pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "{say}", &dict_iter)); - while ((key = pa_proplist_iterate(proplist, state))) { + while ((key = pa_proplist_iterate(proplist, &state))) { const void *value = NULL; size_t nbytes; |