summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Orlenko <zxteam@gmail.com>2010-07-07 22:13:55 +1100
committerAlexander Orlenko <zxteam@gmail.com>2010-07-07 22:13:55 +1100
commit6055ddf9dc1231ebd666e54914b5ae2977b6c630 (patch)
tree09ead5a2eeae3155f56190a1bb57c49ec50f17f4
parent0e4f2355cbc8d85c304822e4acd3bb05eb68ec05 (diff)
downloadbluez-tools-6055ddf9dc1231ebd666e54914b5ae2977b6c630.tar.gz
Added DBusGProxy object unref
-rwxr-xr-xcontrib/gen-dbus-gobject.pl3
-rw-r--r--src/bt-device.c2
-rw-r--r--src/lib/adapter.c3
-rw-r--r--src/lib/audio.c3
-rw-r--r--src/lib/device.c3
-rw-r--r--src/lib/helpers.c3
-rw-r--r--src/lib/input.c3
-rw-r--r--src/lib/manager.c3
-rw-r--r--src/lib/network.c3
-rw-r--r--src/lib/serial.c3
10 files changed, 28 insertions, 1 deletions
diff --git a/contrib/gen-dbus-gobject.pl b/contrib/gen-dbus-gobject.pl
index c09945c..f940df5 100755
--- a/contrib/gen-dbus-gobject.pl
+++ b/contrib/gen-dbus-gobject.pl
@@ -379,6 +379,9 @@ static void {\$object}_dispose(GObject *gobject)
{PROPERTIES_FREE}
{FI_PROPERTIES}
+ /* Proxy free */
+ g_object_unref(self->priv->dbus_g_proxy);
+
/* Chain up to the parent class */
G_OBJECT_CLASS({\$object}_parent_class)->dispose(gobject);
}
diff --git a/src/bt-device.c b/src/bt-device.c
index 346e6b3..58ec3cc 100644
--- a/src/bt-device.c
+++ b/src/bt-device.c
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
g_hash_table_iter_init(&iter, device_services);
while (g_hash_table_iter_next(&iter, &key, &value)) {
- g_print("%d -> %s\n", key, value);
+ g_print("%d:\n%s\n", key, value);
}
g_print("Done\n");
diff --git a/src/lib/adapter.c b/src/lib/adapter.c
index ad63c3a..7cbd4af 100644
--- a/src/lib/adapter.c
+++ b/src/lib/adapter.c
@@ -110,6 +110,9 @@ static void adapter_dispose(GObject *gobject)
g_free(self->priv->name);
g_strfreev(self->priv->uuids);
+ /* Proxy free */
+ g_object_unref(self->priv->dbus_g_proxy);
+
/* Chain up to the parent class */
G_OBJECT_CLASS(adapter_parent_class)->dispose(gobject);
}
diff --git a/src/lib/audio.c b/src/lib/audio.c
index 70f74f5..b30f053 100644
--- a/src/lib/audio.c
+++ b/src/lib/audio.c
@@ -72,6 +72,9 @@ static void audio_dispose(GObject *gobject)
/* Properties free */
g_free(self->priv->state);
+ /* Proxy free */
+ g_object_unref(self->priv->dbus_g_proxy);
+
/* Chain up to the parent class */
G_OBJECT_CLASS(audio_parent_class)->dispose(gobject);
}
diff --git a/src/lib/device.c b/src/lib/device.c
index e1037f9..ba00a7b 100644
--- a/src/lib/device.c
+++ b/src/lib/device.c
@@ -111,6 +111,9 @@ static void device_dispose(GObject *gobject)
g_ptr_array_unref(self->priv->nodes);
g_strfreev(self->priv->uuids);
+ /* Proxy free */
+ g_object_unref(self->priv->dbus_g_proxy);
+
/* Chain up to the parent class */
G_OBJECT_CLASS(device_parent_class)->dispose(gobject);
}
diff --git a/src/lib/helpers.c b/src/lib/helpers.c
index ac879f9..bc8902f 100644
--- a/src/lib/helpers.c
+++ b/src/lib/helpers.c
@@ -137,6 +137,9 @@ const gchar *uuid2service(const gchar *uuid)
g_hash_table_insert(t, "00001202-0000-1000-8000-00805f9b34fb", "GenericFileTransfer");
g_hash_table_insert(t, "00001203-0000-1000-8000-00805f9b34fb", "GenericAudio");
g_hash_table_insert(t, "00001204-0000-1000-8000-00805f9b34fb", "GenericTelephony");
+ // Manualy added
+ g_hash_table_insert(t, "0000112f-0000-1000-8000-00805f9b34fb", "PhoneBookAccess");
+ g_hash_table_insert(t, "831c4071-7bc8-4a9c-a01c-15df25a4adbc", "ActiveSync");
}
if (g_hash_table_lookup(t, uuid) != NULL) {
diff --git a/src/lib/input.c b/src/lib/input.c
index 16770eb..f3fb9f2 100644
--- a/src/lib/input.c
+++ b/src/lib/input.c
@@ -72,6 +72,9 @@ static void input_dispose(GObject *gobject)
/* Properties free */
/* none */
+ /* Proxy free */
+ g_object_unref(self->priv->dbus_g_proxy);
+
/* Chain up to the parent class */
G_OBJECT_CLASS(input_parent_class)->dispose(gobject);
}
diff --git a/src/lib/manager.c b/src/lib/manager.c
index 4949f55..0fb1623 100644
--- a/src/lib/manager.c
+++ b/src/lib/manager.c
@@ -81,6 +81,9 @@ static void manager_dispose(GObject *gobject)
/* Properties free */
g_ptr_array_unref(self->priv->adapters);
+ /* Proxy free */
+ g_object_unref(self->priv->dbus_g_proxy);
+
/* Chain up to the parent class */
G_OBJECT_CLASS(manager_parent_class)->dispose(gobject);
}
diff --git a/src/lib/network.c b/src/lib/network.c
index a287b2a..34e5629 100644
--- a/src/lib/network.c
+++ b/src/lib/network.c
@@ -77,6 +77,9 @@ static void network_dispose(GObject *gobject)
g_free(self->priv->interface);
g_free(self->priv->uuid);
+ /* Proxy free */
+ g_object_unref(self->priv->dbus_g_proxy);
+
/* Chain up to the parent class */
G_OBJECT_CLASS(network_parent_class)->dispose(gobject);
}
diff --git a/src/lib/serial.c b/src/lib/serial.c
index 88577b1..fa5af9c 100644
--- a/src/lib/serial.c
+++ b/src/lib/serial.c
@@ -52,6 +52,9 @@ static void serial_dispose(GObject *gobject)
{
Serial *self = SERIAL(gobject);
+ /* Proxy free */
+ g_object_unref(self->priv->dbus_g_proxy);
+
/* Chain up to the parent class */
G_OBJECT_CLASS(serial_parent_class)->dispose(gobject);
}