[pulseaudio-commits] 4 commits - configure.ac src/modules src/pulsecore

[Tanu Kaskinen]

 configure.ac                                    |    4 ++--
 src/modules/bluetooth/bluetooth-util.c          |    4 ----
 src/modules/bluetooth/module-bluetooth-device.c |    2 +-
 src/pulsecore/module.h                          |    2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 4a4b0c6785d4b510e78e763eba67ef2aa504940d
Author: João Paulo Rechi Vita <jprvita at openbossa.org>
Date:   Fri Jul 12 14:51:25 2013 -0300

    build-sys: Fix misuse of "dependant"
    
    Dependant in British English is a person who is financially supported by
    someone else. To express software dependency relations "dependent"
    should be used instead, which is correct for both British and US
    English.

diff --git a/configure.ac b/configure.ac
index 1d8e40a..0ef0645 100644
--- a/configure.ac
+++ b/configure.ac
@@ -979,7 +979,7 @@ PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id"
 AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
 	      [Fallback machine-id file])
 
-#### BlueZ support (optional, dependant on D-Bus) ####
+#### BlueZ support (optional, dependent on D-Bus) ####
 
 AC_ARG_ENABLE([bluez],
     AS_HELP_STRING([--disable-bluez],[Disable optional BlueZ support]))
@@ -1015,7 +1015,7 @@ AC_SUBST(HAVE_UDEV)
 AM_CONDITIONAL([HAVE_UDEV], [test "x$HAVE_UDEV" = x1])
 AS_IF([test "x$HAVE_UDEV" = "x1"], AC_DEFINE([HAVE_UDEV], 1, [Have UDEV.]))
 
-#### HAL compat support (optional, dependant on UDEV) ####
+#### HAL compat support (optional, dependent on UDEV) ####
 
 AC_ARG_ENABLE([hal-compat],
     AS_HELP_STRING([--disable-hal-compat],[Disable optional HAL->udev transition compatibility support]))

commit ed4d0d989c1d90202414077080356d14ca0ac7de
Author: João Paulo Rechi Vita <jprvita at openbossa.org>
Date:   Fri Jul 12 14:51:24 2013 -0300

    bluetooth: Fix coding style

diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index ea3db48..de29e52 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -2411,7 +2411,7 @@ static pa_hook_result_t discovery_hook_cb(pa_bluetooth_discovery *y, const pa_bl
     return PA_HOOK_OK;
 }
 
-int pa__init(pa_module* m) {
+int pa__init(pa_module *m) {
     pa_modargs *ma;
     uint32_t channels;
     struct userdata *u;

commit 435964784175670dac9302b6c92b57374d8bcdbc
Author: João Paulo Rechi Vita <jprvita at openbossa.org>
Date:   Fri Jul 12 14:51:23 2013 -0300

    bluetooth: Remove unused DBusError

diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index 5924736..dd280cb 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -821,16 +821,12 @@ static pa_dbus_pending* send_and_add_to_pending(pa_bluetooth_discovery *y, DBusM
 }
 
 static void register_endpoint_reply(DBusPendingCall *pending, void *userdata) {
-    DBusError e;
     DBusMessage *r;
     pa_dbus_pending *p;
     pa_bluetooth_discovery *y;
     char *endpoint;
 
     pa_assert(pending);
-
-    dbus_error_init(&e);
-
     pa_assert_se(p = userdata);
     pa_assert_se(y = p->context_data);
     pa_assert_se(endpoint = p->call_data);

commit 701d86dca38eeccdc0928bc41b036decb07517e0
Author: João Paulo Rechi Vita <jprvita at openbossa.org>
Date:   Fri Jul 12 14:51:22 2013 -0300

    module: Fix style

diff --git a/src/pulsecore/module.h b/src/pulsecore/module.h
index ad4571e..5a330c6 100644
--- a/src/pulsecore/module.h
+++ b/src/pulsecore/module.h
@@ -50,7 +50,7 @@ struct pa_module {
     pa_proplist *proplist;
 };
 
-pa_module* pa_module_load(pa_core *c, const char *name, const char*argument);
+pa_module* pa_module_load(pa_core *c, const char *name, const char *argument);
 
 void pa_module_unload(pa_core *c, pa_module *m, bool force);
 void pa_module_unload_by_index(pa_core *c, uint32_t idx, bool force);