[gnome-bluetooth] lib: Fix crasher with BlueZ git master
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth] lib: Fix crasher with BlueZ git master
- Date: Mon, 8 Oct 2012 12:30:46 +0000 (UTC)
commit 9eeb4e5318bf17c2cff681c53e37e3dee676d532
Author: Bastien Nocera <hadess hadess net>
Date: Mon Oct 8 14:29:47 2012 +0200
lib: Fix crasher with BlueZ git master
As the GetProperties calls don't work anymore, make sure we can
fail gracefully.
lib/bluetooth-client.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index e230bd2..a3d4e88 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -524,6 +524,7 @@ add_device (Adapter *adapter,
return;
if (path != NULL) {
+ ret = NULL;
device = device_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
BLUEZ_SERVICE,
@@ -760,6 +761,7 @@ adapter_added (Manager *manager,
const gchar *address, *name;
gboolean discovering, discoverable, powered;
+ variant = NULL;
adapter = adapter_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
BLUEZ_SERVICE,
@@ -963,6 +965,7 @@ bluez_appeared_cb (GDBusConnection *connection,
g_signal_connect (G_OBJECT (priv->manager), "g-signal",
G_CALLBACK (manager_g_signal), client);
+ variant = NULL;
manager_call_get_properties_sync (MANAGER (priv->manager), &variant, NULL, NULL);
if (variant != NULL) {
GVariant *v;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]