summaryrefslogtreecommitdiff
path: root/lib/bluetooth-agent.c
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2011-09-27 22:48:21 +0100
committerBastien Nocera <hadess@hadess.net>2011-09-27 22:48:21 +0100
commit5d572650509c2afe6892a3f7c0e618507a1a4f89 (patch)
tree58d02faff37a5a6808a73553cbec0562ba323984 /lib/bluetooth-agent.c
parent5dfa6064852f6a8a894708b4cce15d4b5bef9c59 (diff)
downloadgnome-bluetooth-5d572650509c2afe6892a3f7c0e618507a1a4f89.tar.gz
lib: Fix BluetoothAgent warnings in wizard
Diffstat (limited to 'lib/bluetooth-agent.c')
-rw-r--r--lib/bluetooth-agent.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/bluetooth-agent.c b/lib/bluetooth-agent.c
index 672ac5ec..e65a6351 100644
--- a/lib/bluetooth-agent.c
+++ b/lib/bluetooth-agent.c
@@ -371,12 +371,14 @@ gboolean bluetooth_agent_setup(BluetoothAgent *agent, const char *path)
priv->path = g_strdup(path);
g_free (priv->busname);
- owner = g_dbus_proxy_get_name_owner (priv->adapter);
- if (owner == NULL)
- priv->busname = g_strdup (g_dbus_proxy_get_name (priv->adapter));
- else
- priv->busname = owner;
- g_free (owner);
+ if (priv->adapter) {
+ owner = g_dbus_proxy_get_name_owner (priv->adapter);
+ if (owner == NULL)
+ priv->busname = g_strdup (g_dbus_proxy_get_name (priv->adapter));
+ else
+ priv->busname = owner;
+ g_free (owner);
+ }
conn = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
priv->id = g_dbus_connection_register_object (conn, priv->path, priv->introspection_data->interfaces[0], &interface_vtable, agent, NULL, NULL);