Merge lp:~tkluck/gnome-shell/10-bluetooth-fix-connection-from-gs-menu.patch into lp:~ubuntu-desktop/gnome-shell/ubuntu

[Timo Kluck]

Sorry for spamming with these merge requests. I'm new to how packaging is organized on launchpad. Thanks for being patient.

This should fix #918208.

[Jeremy Bícha (jbicha)]

Merge proposals aren't spam. Thanks for the help!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-23 15:58:47 +0000
+++ debian/changelog	2012-01-23 16:43:29 +0000
@@ -1,5 +1,6 @@
 gnome-shell (3.2.2.1-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Jeremy Bicha ]
   * New upstream release
     - Fix broken gnome-shell-extension-tool (LP: #853882)
     - Fixes lots of crashes and some memory leaks
@@ -8,7 +9,12 @@
     - 05-NetworkMenu-don-t-query-DBus-properties-of-removed-o.patch
     - 06-NetworkMenu-fix-regression-in-access-point-removed.patch
 
- -- Jeremy Bicha <[e-mail]>  Mon, 23 Jan 2012 10:50:25 -0500
+  [ Timo Kluck ]
+  * debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch:
+    - Fix bluetooth panel switch moving independently from actual
+      connection status
+
+ -- Timo Kluck <[e-mail]>  Mon, 23 Jan 2012 17:28:21 +0100
 
 gnome-shell (3.2.1-8ubuntu2) precise; urgency=low
 

=== added file 'debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch'
--- debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch	2012-01-23 16:43:29 +0000
@@ -0,0 +1,31 @@
+From 0ed0dc89b51f8e584dd21c87a7178ba138bed44b Mon Sep 17 00:00:00 2001
+From: Alessandro Crismani <[e-mail]>
+Date: Tue, 13 Dec 2011 10:01:34 +0100
+Subject: [PATCH] Bluetooth: fix connecting devices from GS's panel on 3.2.1
+
+Connecting devices from Gnome Shell's panel on Gnome 3.2.1 fails because
+of an undefined variable in
+js/ui/status/bluetooth.js:buildDeviceSubMenu. More explicitly, the
+menuitem variable is not declared and hence connecting and disconnecting
+fails. Fix it to make the bluetooth panel menu item work.
+---
+ js/ui/status/bluetooth.js |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
+index f2d95f5..3aa7960 100644
+--- a/js/ui/status/bluetooth.js
++++ b/js/ui/status/bluetooth.js
+@@ -205,7 +205,8 @@ Indicator.prototype = {
+     _buildDeviceSubMenu: function(item, device) {
+         if (device.can_connect) {
+             item._connected = device.connected;
+-            item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
++            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
++            item._connectedMenuitem = menuitem;
+             item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
+                 if (item._connected > ConnectionState.CONNECTED) {
+                     // operation already in progress, revert
+-- 
+1.7.8
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-01-23 15:58:47 +0000
+++ debian/patches/series	2012-01-23 16:43:29 +0000
@@ -1,3 +1,4 @@
+10-bluetooth-fix-connection-from-gs-menu.patch
 02_rpath-bluetooth-applet.patch
 04_remove-glx-dependency-on-armel.patch
 07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch