r35503 - in /desktop/unstable/gnome-bluetooth/debian: changelog patches/02_Fix-return-of-RequestConfirmation-call.patch patches/03_Fix_wizard_blocked_in_finish_page.patch patches/series

Sat Jun 30 17:37:39 UTC 2012

Author: sjoerd
Date: Sat Jun 30 17:37:39 2012
New Revision: 35503

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35503
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)

Added:
    desktop/unstable/gnome-bluetooth/debian/patches/02_Fix-return-of-RequestConfirmation-call.patch
    desktop/unstable/gnome-bluetooth/debian/patches/03_Fix_wizard_blocked_in_finish_page.patch
Modified:
    desktop/unstable/gnome-bluetooth/debian/changelog
    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=35503&op=diff
==============================================================================

--- desktop/unstable/gnome-bluetooth/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/changelog [utf-8] Sat Jun 30 17:37:39 2012
@@ -1,3 +1,11 @@
+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
+
 gnome-bluetooth (3.4.1-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gnome-bluetooth/debian/patches/02_Fix-return-of-RequestConfirmation-call.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-bluetooth/debian/patches/02_Fix-return-of-RequestConfirmation-call.patch?rev=35503&op=file
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/patches/02_Fix-return-of-RequestConfirmation-call.patch (added)
+++ desktop/unstable/gnome-bluetooth/debian/patches/02_Fix-return-of-RequestConfirmation-call.patch [utf-8] Sat Jun 30 17:37:39 2012
@@ -1,0 +1,30 @@
+From 46212ad97de694db45af525cd200c52e6eafb93b Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sat, 30 Jun 2012 10:45:45 +0200
+Subject: [PATCH] Fix return of RequestConfirmation call
+
+The bluez RequestConfirmation call expect either an empty message (on
+success) or an error (on failure) as return. For some reason the code
+tries to return a string on success though, contrary to even what the
+internal introspection data says causing gdbus to just throw a warning
+and bluez never getting a response... Causing pairing to fail.
+---
+ wizard/main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wizard/main.c b/wizard/main.c
+index 417c84c..e7cc9cc 100644
+--- a/wizard/main.c
++++ b/wizard/main.c
+@@ -261,7 +261,7 @@ matches_cb (GtkButton *button,
+ 	invocation = g_object_get_data (G_OBJECT (button), "invocation");
+ 	gtk_widget_set_sensitive (does_not_match_button, FALSE);
+ 	gtk_widget_set_sensitive (matches_button, FALSE);
+-	g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", ""));
++	g_dbus_method_invocation_return_value (invocation, NULL);
+ 
+ 	g_object_set_data (G_OBJECT(does_not_match_button), "invocation", NULL);
+ 	g_object_set_data (G_OBJECT(matches_button), "invocation", NULL);
+-- 
+1.7.10
+

Added: 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=35503&op=file
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/patches/03_Fix_wizard_blocked_in_finish_page.patch (added)
+++ desktop/unstable/gnome-bluetooth/debian/patches/03_Fix_wizard_blocked_in_finish_page.patch [utf-8] Sat Jun 30 17:37:39 2012
@@ -1,0 +1,50 @@
+From f0a95b5d28ff55e9ed4b148d9872645ae3d8e049 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
+ _complete_in_idle
+
+Currently bluetooth_client_connect_service complets it async operation
+directly when bailing (e.g. we don't have connectable service on the
+remote device). This causes the bluetooth wizard to get stuck in the
+Finishing page as it happens to go to this page *after* calling
+bluetooth_client_connect_service.
+
+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(-)
+
+diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
+index 21bcd38..114f9ad 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,
+ 
+ bail:
+ 	g_simple_async_result_set_op_res_gboolean (simple, res);
+-	g_simple_async_result_complete (simple);
++	g_simple_async_result_complete_in_idle (simple);
+ 	g_object_unref (simple);
+ }
+ 
+-- 
+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=35503&op=diff
==============================================================================
--- desktop/unstable/gnome-bluetooth/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-bluetooth/debian/patches/series [utf-8] Sat Jun 30 17:37:39 2012
@@ -1,1 +1,3 @@
 01_autostart_path.patch
+02_Fix-return-of-RequestConfirmation-call.patch
+03_Fix_wizard_blocked_in_finish_page.patch


