r32698 - in /desktop/unstable/gnome-shell/debian: changelog patches/12_Replace-shell_util_icon_from_string.patch patches/13_bluetooth_fix_undefined_variable.patch patches/series

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Tue Feb 28 10:26:00 UTC 2012 

Author: sjoerd
Date: Tue Feb 28 10:25:59 2012
New Revision: 32698

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32698
Log:
* debian/patches/12_Replace-shell_util_icon_from_string.patch
  + Added. Remove the neglected user of the removed
    Shell.util_icon_from_string function. This caused subscription request
    to not pop up (From upstream git)
* debian/patches/13_bluetooth_fix_undefined_variable.patch
  + Added. Fixes bluetooth device status slider so it reflects reality again
  (From upstream git)

Added:
    desktop/unstable/gnome-shell/debian/patches/12_Replace-shell_util_icon_from_string.patch
    desktop/unstable/gnome-shell/debian/patches/13_bluetooth_fix_undefined_variable.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=32698&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Tue Feb 28 10:25:59 2012
@@ -1,3 +1,15 @@
+gnome-shell (3.2.2.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/12_Replace-shell_util_icon_from_string.patch
+    + Added. Remove the neglected user of the removed
+      Shell.util_icon_from_string function. This caused subscription request
+      to not pop up (From upstream git)
+  * debian/patches/13_bluetooth_fix_undefined_variable.patch
+    + Added. Fixes bluetooth device status slider so it reflects reality again
+    (From upstream git)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 28 Feb 2012 11:12:03 +0100
+
 gnome-shell (3.2.2.1-1) unstable; urgency=low
 
   [ Michael Biebl ]

Added: desktop/unstable/gnome-shell/debian/patches/12_Replace-shell_util_icon_from_string.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/12_Replace-shell_util_icon_from_string.patch?rev=32698&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/12_Replace-shell_util_icon_from_string.patch (added)
+++ desktop/unstable/gnome-shell/debian/patches/12_Replace-shell_util_icon_from_string.patch [utf-8] Tue Feb 28 10:25:59 2012
@@ -1,0 +1,29 @@
+From b62f5ef07d87db7835fa753fe1774a5ed32d871d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Mon, 24 Oct 2011 15:52:13 +0200
+Subject: [PATCH] telepathy-client: Replace shell_util_new_from_string
+
+The function has been removed in commit 786cfbd3976, but one user
+was overlooked when replacing it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661231
+---
+ js/ui/telepathyClient.js |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
+index 695a12b..3c14eda 100644
+--- a/js/ui/telepathyClient.js
++++ b/js/ui/telepathyClient.js
+@@ -1297,7 +1297,7 @@ MultiNotificationSource.prototype = {
+     },
+ 
+     createNotificationIcon: function() {
+-        return new St.Icon({ gicon: Shell.util_icon_from_string(this._icon),
++        return new St.Icon({ gicon: Gio.icon_new_for_string(this._icon),
+                              icon_type: St.IconType.FULLCOLOR,
+                              icon_size: this.ICON_SIZE });
+     }
+-- 
+1.7.9.1
+

Added: desktop/unstable/gnome-shell/debian/patches/13_bluetooth_fix_undefined_variable.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/13_bluetooth_fix_undefined_variable.patch?rev=32698&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/13_bluetooth_fix_undefined_variable.patch (added)
+++ desktop/unstable/gnome-shell/debian/patches/13_bluetooth_fix_undefined_variable.patch [utf-8] Tue Feb 28 10:25:59 2012
@@ -1,0 +1,39 @@
+From d856338f863f9c8ccb6a691a657955a2940f0891 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre at mecheye.net>
+Date: Fri, 11 Nov 2011 20:04:10 -0500
+Subject: [PATCH] bluetooth: Fix undefined variable issue
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663891
+---
+ js/ui/status/bluetooth.js |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
+index f2d95f5..9118c6f 100644
+--- a/js/ui/status/bluetooth.js
++++ b/js/ui/status/bluetooth.js
+@@ -204,9 +204,10 @@ Indicator.prototype = {
+ 
+     _buildDeviceSubMenu: function(item, device) {
+         if (device.can_connect) {
++            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+             item._connected = device.connected;
+-            item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
+-            item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
++            item._connectedMenuItem = menuitem;
++            menuitem.connect('toggled', Lang.bind(this, function() {
+                 if (item._connected > ConnectionState.CONNECTED) {
+                     // operation already in progress, revert
+                     // (should not happen anyway)
+@@ -241,7 +242,7 @@ Indicator.prototype = {
+                 }
+             }));
+ 
+-            item.menu.addMenuItem(item._connectedMenuitem);
++            item.menu.addMenuItem(menuitem);
+         }
+ 
+         if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) {
+-- 
+1.7.9.1
+

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=32698&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Tue Feb 28 10:25:59 2012
@@ -1,10 +1,9 @@
 02_rpath-bluetooth-applet.patch
 04_remove-glx-dependency-on-armel.patch
-#05-NetworkMenu-don-t-query-DBus-properties-of-removed-o.patch
-#06-NetworkMenu-fix-regression-in-access-point-removed.patch
 07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch
 08-polkit-Find-the-best-user-to-authenticate-as.patch
 09-respect-NoDisplay-semantics-for-app-menu.patch
 10-make-NetworkManager-optional.patch
 11-no-gettext.patch
-#12-gnome-shell-extension-tool-Fix-error-after-creating-.patch
+12_Replace-shell_util_icon_from_string.patch
+13_bluetooth_fix_undefined_variable.patch

More information about the pkg-gnome-commits mailing list