Hello community, here is the log from the commit of package gnome-shell for openSUSE:Factory checked in at 2014-10-06 12:06:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell (Old) and /work/SRC/openSUSE:Factory/.gnome-shell.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-shell" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell/gnome-shell.changes 2014-09-30 19:39:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-shell.new/gnome-shell.changes 2014-10-06 12:06:08.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Oct 5 16:49:40 UTC 2014 - dims...@opensuse.org + +- Rebase and re-enable gnome-shell-private-connection.patch + (boo#899789). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell.spec ++++++ --- /var/tmp/diff_new_pack.iiqh4t/_old 2014-10-06 12:06:09.000000000 +0200 +++ /var/tmp/diff_new_pack.iiqh4t/_new 2014-10-06 12:06:09.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/GUI/GNOME Url: http://live.gnome.org/GnomeShell Source: http://download.gnome.org/sources/gnome-shell/3.14/%{name}-%{version}.tar.xz -# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dims...@opensuse.org -- create private connections if the user is not authorized +# PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dims...@opensuse.org -- create private connections if the user is not authorized Patch1: gnome-shell-private-connection.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc-c++ @@ -142,8 +142,7 @@ %lang_package %prep %setup -q -# NEEDS REBASE -#patch1 -p1 +%patch1 -p1 translation-update-upstream %build ++++++ gnome-shell-private-connection.patch ++++++ --- /var/tmp/diff_new_pack.iiqh4t/_old 2014-10-06 12:06:09.000000000 +0200 +++ /var/tmp/diff_new_pack.iiqh4t/_new 2014-10-06 12:06:09.000000000 +0200 @@ -14,10 +14,10 @@ js/ui/status/network.js | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) -diff --git a/js/ui/status/network.js b/js/ui/status/network.js -index 0ff2037..7deb7f4 100644 ---- a/js/ui/status/network.js -+++ b/js/ui/status/network.js +Index: gnome-shell-3.14.0/js/ui/status/network.js +=================================================================== +--- gnome-shell-3.14.0.orig/js/ui/status/network.js ++++ gnome-shell-3.14.0/js/ui/status/network.js @@ -7,6 +7,7 @@ const Gtk = imports.gi.Gtk; const Lang = imports.lang; const NetworkManager = imports.gi.NetworkManager; @@ -25,8 +25,20 @@ +const Polkit = imports.gi.Polkit; const NMGtk = imports.gi.NMGtk; const Signals = imports.signals; - const St = imports.gi.St; -@@ -506,10 +507,12 @@ const NMDeviceBluetooth = new Lang.Class({ + const Shell = imports.gi.Shell; +@@ -372,6 +373,11 @@ const NMConnectionDevice = new Lang.Clas + + _autoConnect: function() { + let connection = new NetworkManager.Connection(); ++ if (this._privateConnections) { ++ let connectionSetting = new NetworkManager.SettingConnection(); ++ connectionSetting.add_permission('user', GLib.get_user_name(), null); ++ connection.add_setting(connectionSetting); ++ } + this._client.add_and_activate_connection(connection, this._device, null, null); + }, + +@@ -618,10 +624,12 @@ const NMDeviceBluetooth = new Lang.Class Extends: NMConnectionDevice, category: NMConnectionCategory.WWAN, @@ -39,20 +51,8 @@ + this._privateConnections = privateConnections; }, - _autoConnect: function() { -@@ -520,6 +523,11 @@ const NMDeviceBluetooth = new Lang.Class({ - // that this phone supports PAN - - let connection = new NetworkManager.Connection(); -+ if (this._privateConnections) { -+ let connectionSetting = new NetworkManager.SettingConnection(); -+ connectionSetting.add_permission('user', GLib.get_user_name(), null); -+ connection.add_setting(connectionSetting); -+ } - this._client.add_and_activate_connection(connection, this._device, null, null); - return true; - }, -@@ -624,11 +632,12 @@ const NMWirelessDialog = new Lang.Class({ + _getDescription: function() { +@@ -716,11 +724,12 @@ const NMWirelessDialog = new Lang.Class( Name: 'NMWirelessDialog', Extends: ModalDialog.ModalDialog, @@ -64,9 +64,9 @@ this._device = device; + this._privateConnections = privateConnections; - this._networks = []; - this._buildLayout(); -@@ -766,6 +775,11 @@ const NMWirelessDialog = new Lang.Class({ + this._wirelessEnabledChangedId = this._client.connect('notify::wireless-enabled', + Lang.bind(this, this._syncView)); +@@ -937,6 +946,11 @@ const NMWirelessDialog = new Lang.Class( this._device.get_path(), accessPoints[0].dbus_path]); } else { let connection = new NetworkManager.Connection(); @@ -78,7 +78,7 @@ this._client.add_and_activate_connection(connection, this._device, accessPoints[0].dbus_path, null) } } -@@ -994,10 +1008,11 @@ const NMDeviceWireless = new Lang.Class({ +@@ -1162,10 +1176,11 @@ const NMDeviceWireless = new Lang.Class( Name: 'NMDeviceWireless', category: NMConnectionCategory.WIRELESS, @@ -91,7 +91,7 @@ this._description = ''; -@@ -1065,7 +1080,7 @@ const NMDeviceWireless = new Lang.Class({ +@@ -1247,7 +1262,7 @@ const NMDeviceWireless = new Lang.Class( }, _showDialog: function() { @@ -100,7 +100,7 @@ this._dialog.connect('closed', Lang.bind(this, this._dialogClosed)); this._dialog.open(); }, -@@ -1326,6 +1341,19 @@ const NMApplet = new Lang.Class({ +@@ -1606,6 +1621,19 @@ const NMApplet = new Lang.Class({ if (!this._client || !this._settings) return; @@ -119,8 +119,8 @@ + this._activeConnections = [ ]; this._connections = [ ]; - -@@ -1441,7 +1469,7 @@ const NMApplet = new Lang.Class({ + this._connectivityQueue = [ ]; +@@ -1715,7 +1743,7 @@ const NMApplet = new Lang.Class({ let wrapperClass = this._dtypes[device.get_device_type()]; if (wrapperClass) { @@ -129,6 +129,3 @@ device._delegate = wrapper; this._addDeviceWrapper(wrapper); --- -1.8.1.4 - -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
