r35504 - in /desktop/unstable/gnome-bluetooth/debian: changelog patches/03_Fix_wizard_blocked_in_finish_page.patch patches/04_fix_incoming_pairing.patch patches/05_fix_memory_leak.patch patches/series
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Mon Jul 2 07:10:13 UTC 2012
Author: sjoerd
Date: Mon Jul 2 07:10:12 2012
New Revision: 35504
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35504
Log:
* Added: debian/patches/02_Fix-return-of-RequestConfirmation-call.patch,
debian/patches/03_Fix_wizard_blocked_in_finish_page.patch
+ Fix pairing with devices supporting SSP (Closes: #679644) (bgo: 679190)
* Added: debian/patches/04_fix_incoming_pairing.patch,
+ Fix incoming pairing requests (bgo: 674414)
* Added debian/patches/05_fix_memory_leak.patch:
+ Fix memory leak (bgo: 679420)
Added:
desktop/unstable/gnome-bluetooth/debian/patches/04_fix_incoming_pairing.patch
desktop/unstable/gnome-bluetooth/debian/patches/05_fix_memory_leak.patch
Modified:
desktop/unstable/gnome-bluetooth/debian/changelog
desktop/unstable/gnome-bluetooth/debian/patches/03_Fix_wizard_blocked_in_finish_page.patch
desktop/unstable/gnome-bluetooth/debian/patches/series
Modified: desktop/unstable/gnome-bluetooth/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/changelog?rev=35504&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/changelog [utf-8] Mon Jul 2 07:10:12 2012
@@ -1,10 +1,14 @@
gnome-bluetooth (3.4.1-2) UNRELEASED; urgency=low
- * Added debian/patches/02_Fix-return-of-RequestConfirmation-call.patch
- * debian/patches/03_Fix_wizard_blocked_in_finish_page.patch
- + Fix pairing with devices supporting SSP (Closes: #679644)
-
- -- Sjoerd Simons <sjoerd at debian.org> Sat, 30 Jun 2012 19:36:29 +0200
+ * Added: debian/patches/02_Fix-return-of-RequestConfirmation-call.patch,
+ debian/patches/03_Fix_wizard_blocked_in_finish_page.patch
+ + Fix pairing with devices supporting SSP (Closes: #679644) (bgo: 679190)
+ * Added: debian/patches/04_fix_incoming_pairing.patch,
+ + Fix incoming pairing requests (bgo: 674414)
+ * Added debian/patches/05_fix_memory_leak.patch:
+ + Fix memory leak (bgo: 679420)
+
+ -- Sjoerd Simons <sjoerd at debian.org> Mon, 02 Jul 2012 09:07:33 +0200
gnome-bluetooth (3.4.1-1) unstable; urgency=low
Modified: desktop/unstable/gnome-bluetooth/debian/patches/03_Fix_wizard_blocked_in_finish_page.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/patches/03_Fix_wizard_blocked_in_finish_page.patch?rev=35504&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/patches/03_Fix_wizard_blocked_in_finish_page.patch [utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/patches/03_Fix_wizard_blocked_in_finish_page.patch [utf-8] Mon Jul 2 07:10:12 2012
@@ -1,7 +1,7 @@
-From f0a95b5d28ff55e9ed4b148d9872645ae3d8e049 Mon Sep 17 00:00:00 2001
+From bb1e1a273e49b11b38106042fdf430a38343f8d1 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd at luon.net>
Date: Sat, 30 Jun 2012 14:27:47 +0200
-Subject: [PATCH 2/2] When bailing from a connect attempt use
+Subject: [PATCH 2/4] When bailing from a connect attempt use
_complete_in_idle
Currently bluetooth_client_connect_service complets it async operation
@@ -13,30 +13,14 @@
Simply make the async operation complete asynchronously (like it should)
and everything is happy again :)
---
- lib/bluetooth-client.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ lib/bluetooth-client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
-index 21bcd38..114f9ad 100644
+index 21bcd38..73e987d 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
-@@ -547,12 +547,15 @@ add_device (Adapter *adapter,
-
- v = g_variant_lookup_value (ret, "Alias", G_VARIANT_TYPE_STRING);
- alias = v ? g_variant_get_string (v, NULL) : NULL;
-+ printf ("Alias: %s\n", alias);
-
- v = g_variant_lookup_value (ret, "Name", G_VARIANT_TYPE_STRING);
- name = v ? g_variant_get_string (v, NULL) : NULL;
-+ printf ("Name: %s\n", name);
-
- v = g_variant_lookup_value (ret, "Class", G_VARIANT_TYPE_UINT32);
- type = v ? bluetooth_class_to_type (g_variant_get_uint32 (v)) : BLUETOOTH_TYPE_ANY;
-+ printf ("Class: %x\n", g_variant_get_uint32 (v));
-
- v = g_variant_lookup_value (ret, "Icon", G_VARIANT_TYPE_STRING);
- icon = v ? g_variant_get_string (v, NULL) : "bluetooth";
-@@ -1870,7 +1873,7 @@ bluetooth_client_connect_service (BluetoothClient *client,
+@@ -1870,7 +1870,7 @@ bluetooth_client_connect_service (BluetoothClient *client,
bail:
g_simple_async_result_set_op_res_gboolean (simple, res);
Added: desktop/unstable/gnome-bluetooth/debian/patches/04_fix_incoming_pairing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/patches/04_fix_incoming_pairing.patch?rev=35504&op=file
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/patches/04_fix_incoming_pairing.patch (added)
+++ desktop/unstable/gnome-bluetooth/debian/patches/04_fix_incoming_pairing.patch [utf-8] Mon Jul 2 07:10:12 2012
@@ -1,0 +1,45 @@
+From 4ea6a4ead9440d3b3b1e38623535c53adbf1be32 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sun, 1 Jul 2012 12:28:20 +0200
+Subject: [PATCH 3/4] g_dbus_proxy_call_sync returns a tuple with the results,
+ not the results directly
+
+---
+ applet/bluetooth-applet.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/applet/bluetooth-applet.c b/applet/bluetooth-applet.c
+index 0eb2973..32d373e 100644
+--- a/applet/bluetooth-applet.c
++++ b/applet/bluetooth-applet.c
+@@ -313,6 +313,7 @@ device_get_name (GDBusProxy *proxy, char **long_name)
+ {
+ GVariant *value;
+ GVariant *result;
++ GVariant *dict;
+ char *alias, *address;
+
+ g_return_val_if_fail (long_name != NULL, NULL);
+@@ -322,14 +323,17 @@ device_get_name (GDBusProxy *proxy, char **long_name)
+ if (result == NULL)
+ return NULL;
+
+- value = g_variant_lookup_value (result, "Address", G_VARIANT_TYPE_STRING);
++ /* Retrieve the dictionary */
++ dict = g_variant_get_child_value (result, 0);
++
++ value = g_variant_lookup_value (dict, "Address", G_VARIANT_TYPE_STRING);
+ if (value == NULL) {
+ g_variant_unref (result);
+ return NULL;
+ }
+ address = g_strdup (g_variant_get_string (value, NULL));
+
+- value = g_variant_lookup_value (result, "Name", G_VARIANT_TYPE_STRING);
++ value = g_variant_lookup_value (dict, "Name", G_VARIANT_TYPE_STRING);
+ alias = value ? g_strdup (g_variant_get_string (value, NULL)) : g_strdup (address);
+
+ g_variant_unref (result);
+--
+1.7.10
+
Added: desktop/unstable/gnome-bluetooth/debian/patches/05_fix_memory_leak.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/patches/05_fix_memory_leak.patch?rev=35504&op=file
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/patches/05_fix_memory_leak.patch (added)
+++ desktop/unstable/gnome-bluetooth/debian/patches/05_fix_memory_leak.patch [utf-8] Mon Jul 2 07:10:12 2012
@@ -1,0 +1,41 @@
+From 23bc16eab6253cb84f9ac5cee2029131cc2c8d04 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sun, 1 Jul 2012 12:28:37 +0200
+Subject: [PATCH 4/4] Fix memory leak when registering the agent
+
+---
+ lib/bluetooth-agent.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lib/bluetooth-agent.c b/lib/bluetooth-agent.c
+index 01273e1..2eece93 100644
+--- a/lib/bluetooth-agent.c
++++ b/lib/bluetooth-agent.c
+@@ -437,6 +437,7 @@ gboolean bluetooth_agent_register(BluetoothAgent *agent)
+ BluetoothAgentPrivate *priv;
+ GError *error = NULL;
+ char *path;
++ GVariant *r;
+
+ g_return_val_if_fail (BLUETOOTH_IS_AGENT (agent), FALSE);
+
+@@ -469,13 +470,14 @@ gboolean bluetooth_agent_register(BluetoothAgent *agent)
+ error = NULL;
+ }
+
+- if (g_dbus_proxy_call_sync (priv->adapter, "RegisterAgent",
++ if ((r = g_dbus_proxy_call_sync (priv->adapter, "RegisterAgent",
+ g_variant_new ("(os)", priv->path, "DisplayYesNo"),
+ G_DBUS_CALL_FLAGS_NONE,
+- -1, NULL, &error) == FALSE) {
++ -1, NULL, &error)) == NULL) {
+ g_printerr ("Agent registration failed: %s\n", error->message);
+ g_error_free (error);
+ }
++ g_variant_unref (r);
+
+ return TRUE;
+ }
+--
+1.7.10
+
Modified: desktop/unstable/gnome-bluetooth/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/patches/series?rev=35504&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/patches/series [utf-8] Mon Jul 2 07:10:12 2012
@@ -1,3 +1,5 @@
01_autostart_path.patch
02_Fix-return-of-RequestConfirmation-call.patch
03_Fix_wizard_blocked_in_finish_page.patch
+04_fix_incoming_pairing.patch
+05_fix_memory_leak.patch
More information about the pkg-gnome-commits
mailing list