Merge commit 'elmarco/dbus'

This commit is contained in:
Lennart Poettering 2009-03-30 20:26:27 +02:00
commit d33be12fde
19 changed files with 386 additions and 137 deletions

View file

@ -42,6 +42,7 @@
#include <pulsecore/hashmap.h>
#include <pulsecore/refcnt.h>
#include <pulsecore/time-smoother.h>
#include <pulsecore/dbus-util.h>
#include "client-conf.h"
@ -50,6 +51,10 @@
struct pa_context {
PA_REFCNT_DECLARE;
pa_bool_t no_fail:1;
pa_dbus_wrap_connection *system_bus;
pa_dbus_wrap_connection *session_bus;
pa_proplist *proplist;
pa_mainloop_api* mainloop;