r36584 - in /desktop/unstable/gnome-shell/debian: changelog patches/05-NetworkMenu-fix-updating-connection-lists.patch patches/28_network_user_connections.patch patches/40-force-online.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Jan 15 15:56:56 2013
New Revision: 36584

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36584
Log:
Revert r36575, it breaks the VPN menu

Removed:
    desktop/unstable/gnome-shell/debian/patches/05-NetworkMenu-fix-updating-connection-lists.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/28_network_user_connections.patch
    desktop/unstable/gnome-shell/debian/patches/40-force-online.patch
    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=36584&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Tue Jan 15 15:56:56 2013
@@ -16,9 +16,6 @@
 
   [ Michael Biebl ]
   * Refresh patches to apply without fuzz.
-  * 05-NetworkMenu-fix-updating-connection-lists.patch: Properly update the
-    Network UI when connections change their name or id. Patch cherry-picked
-    from upstream Git.
   * 40-force-online.patch: If NM has an active unmanaged device it will
     forcefully set the online state to CONNECTED_GLOBAL. In that case show a
     wired connection icon instead of an offline icon. Closes: #691436

Modified: desktop/unstable/gnome-shell/debian/patches/28_network_user_connections.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/28_network_user_connections.patch?rev=36584&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/28_network_user_connections.patch [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/28_network_user_connections.patch [utf-8] Tue Jan 15 15:56:56 2013
@@ -1,8 +1,8 @@
 Index: gnome-shell-3.4.2/js/ui/status/network.js
 ===================================================================
---- gnome-shell-3.4.2.orig/js/ui/status/network.js	2013-01-15 00:12:14.109789321 +0100
-+++ gnome-shell-3.4.2/js/ui/status/network.js	2013-01-15 00:12:14.101789249 +0100
-@@ -97,6 +97,11 @@
+--- gnome-shell-3.4.2.orig/js/ui/status/network.js	2012-07-20 19:38:25.000000000 +0200
++++ gnome-shell-3.4.2/js/ui/status/network.js	2013-01-14 16:16:07.806637098 +0100
+@@ -97,6 +97,11 @@ function ssidToLabel(ssid) {
      return label;
  }
  
@@ -14,13 +14,13 @@
  const NMNetworkMenuItem = new Lang.Class({
      Name: 'NMNetworkMenuItem',
      Extends: PopupMenu.PopupBaseMenuItem,
-@@ -863,12 +868,14 @@
+@@ -864,12 +869,14 @@ const NMDeviceBluetooth = new Lang.Class
          let connection = new NetworkManager.Connection;
-         let uuid = NetworkManager.utils_uuid_generate();
+         connection._uuid = NetworkManager.utils_uuid_generate();
          connection.add_setting(new NetworkManager.SettingBluetooth);
 -        connection.add_setting(new NetworkManager.SettingConnection({
 +        let setting_conn = new NetworkManager.SettingConnection({
-             uuid: uuid,
+             uuid: connection._uuid,
              id: this._autoConnectionName,
              type: NetworkManager.SETTING_BLUETOOTH_SETTING_NAME,
              autoconnect: false
@@ -31,7 +31,7 @@
          return connection;
      },
  
-@@ -949,6 +956,8 @@
+@@ -950,6 +957,8 @@ const NMDeviceWireless = new Lang.Class(
          this._overflowItem = null;
          this._networks = [ ];
  
@@ -40,7 +40,7 @@
          // breaking the layers with this, but cannot call
          // this.connectionValid until I have a device
          this.device = device;
-@@ -1452,12 +1461,22 @@
+@@ -1455,12 +1464,22 @@ const NMDeviceWireless = new Lang.Class(
  
          let connection = new NetworkManager.Connection();
          connection.add_setting(new NetworkManager.SettingWireless());

Modified: desktop/unstable/gnome-shell/debian/patches/40-force-online.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/40-force-online.patch?rev=36584&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/40-force-online.patch [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/40-force-online.patch [utf-8] Tue Jan 15 15:56:56 2013
@@ -6,9 +6,9 @@
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691436
 Index: gnome-shell-3.4.2/js/ui/status/network.js
 ===================================================================
---- gnome-shell-3.4.2.orig/js/ui/status/network.js	2013-01-15 00:12:23.921878067 +0100
-+++ gnome-shell-3.4.2/js/ui/status/network.js	2013-01-15 00:12:23.913877995 +0100
-@@ -2017,9 +2017,14 @@
+--- gnome-shell-3.4.2.orig/js/ui/status/network.js	2013-01-15 16:54:32.406324948 +0100
++++ gnome-shell-3.4.2/js/ui/status/network.js	2013-01-15 16:54:32.398324715 +0100
+@@ -2023,9 +2023,14 @@
          let mc = this._mainConnection;
          let hasApIcon = false;
          let hasMobileIcon = false;

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=36584&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Tue Jan 15 15:56:56 2013
@@ -2,7 +2,6 @@
 02_filter_nodisplay_parents.patch
 03_don-t-show-apps-in-NoDisplay-categories.patch
 04_fix_nodisplay.patch
-05-NetworkMenu-fix-updating-connection-lists.patch
 10-make-NetworkManager-optional.patch
 11-no-gettext.patch
 14_make-GLX-optional.patch