Merge commit 'elmarco/dbus'

diff --cc src/pulse/context.c
index 7c86a4355ac295bd535a6d3c53b03e01b39cfc9e,a18a6423c92ec20164555849c2a83063202a590f..9fb9e7268789b27e055c5db72a983b20af2cc680
--- 1/src/pulse/context.c
--- 2/src/pulse/context.c
+++ b/src/pulse/context.c
@@@ -99,11 -99,10 +99,12 @@@ static const pa_pdispatch_cb_t command_
      [PA_COMMAND_EXTENSION] = pa_command_extension,
      [PA_COMMAND_PLAYBACK_STREAM_EVENT] = pa_command_stream_event,
      [PA_COMMAND_RECORD_STREAM_EVENT] = pa_command_stream_event,
 -    [PA_COMMAND_CLIENT_EVENT] = pa_command_client_event
 +    [PA_COMMAND_CLIENT_EVENT] = pa_command_client_event,
 +    [PA_COMMAND_PLAYBACK_BUFFER_ATTR_CHANGED] = pa_command_stream_buffer_attr,
 +    [PA_COMMAND_RECORD_BUFFER_ATTR_CHANGED] = pa_command_stream_buffer_attr
  };
  static void context_free(pa_context *c);
+ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, void *userdata);
  
  pa_context *pa_context_new(pa_mainloop_api *mainloop, const char *name) {
      return pa_context_new_with_proplist(mainloop, name, NULL);

diff --cc src/pulse/def.h
Simple merge

diff --cc src/pulse/internal.h
Simple merge