drop all upstreamed patches since none of them are being applied anymore
This commit is contained in:
parent
6fa4b55df2
commit
944e518dcb
@ -1,57 +0,0 @@
|
|||||||
From 66edfa88a1f72d120c5b99d54aada1b6810239b0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ray Strode <rstrode@redhat.com>
|
|
||||||
Date: Fri, 25 Mar 2011 09:36:59 -0400
|
|
||||||
Subject: [PATCH] NetworkStatus: Adapt to nm_client_activate_connection api change
|
|
||||||
|
|
||||||
It now takes a connection directly instead of the object path associated
|
|
||||||
with a connection.
|
|
||||||
---
|
|
||||||
js/ui/status/network.js | 9 ++++-----
|
|
||||||
1 files changed, 4 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
|
|
||||||
index e57349a..7990332 100644
|
|
||||||
--- a/js/ui/status/network.js
|
|
||||||
+++ b/js/ui/status/network.js
|
|
||||||
@@ -379,7 +379,7 @@ NMDevice.prototype = {
|
|
||||||
// pick the most recently used connection and connect to that
|
|
||||||
// or if no connections ever set, create an automatic one
|
|
||||||
if (this._connections.length > 0) {
|
|
||||||
- this._client.activate_connection(this._connections[0].connection.path, this.device, null, null);
|
|
||||||
+ this._client.activate_connection(this._connections[0].connection, this.device, null, null);
|
|
||||||
} else if (this._autoConnectionName) {
|
|
||||||
let connection = this._createAutomaticConnection();
|
|
||||||
this._client.add_and_activate_connection(connection, this.device, null, null);
|
|
||||||
@@ -552,10 +552,9 @@ NMDevice.prototype = {
|
|
||||||
},
|
|
||||||
|
|
||||||
_createConnectionItem: function(obj) {
|
|
||||||
- let path = obj.connection.path;
|
|
||||||
let item = new PopupMenu.PopupMenuItem(obj.name);
|
|
||||||
item.connect('activate', Lang.bind(this, function() {
|
|
||||||
- this._client.activate_connection(path, this.device, null, null);
|
|
||||||
+ this._client.activate_connection(obj.connection, this.device, null, null);
|
|
||||||
}));
|
|
||||||
return item;
|
|
||||||
},
|
|
||||||
@@ -1001,7 +1000,7 @@ NMDeviceWireless.prototype = {
|
|
||||||
for (let i = 0; i < bestApObj.accessPoints.length; i++) {
|
|
||||||
let ap = bestApObj.accessPoints[i];
|
|
||||||
if (this._connectionValidForAP(best, ap)) {
|
|
||||||
- this._client.activate_connection(best.path, this.device, ap.dbus_path, null);
|
|
||||||
+ this._client.activate_connection(best, this.device, ap.dbus_path, null);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1136,7 +1135,7 @@ NMDeviceWireless.prototype = {
|
|
||||||
let accessPoints = sortAccessPoints(accessPointObj.accessPoints);
|
|
||||||
for (let i = 0; i < accessPoints.length; i++) {
|
|
||||||
if (this._connectionValidForAP(connection, accessPoints[i])) {
|
|
||||||
- this._client.activate_connection(connection.path, this.device, accessPoints[i].dbus_path, null);
|
|
||||||
+ this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.7.4.1
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
|||||||
From 3af64ea2d2a0b76da1a974966d9be21779e308e8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ray Strode <rstrode@redhat.com>
|
|
||||||
Date: Fri, 25 Mar 2011 09:49:15 -0400
|
|
||||||
Subject: [PATCH] NetworkStatus: fix vpn indicator
|
|
||||||
|
|
||||||
It looks like a part of the code wasn't updated to reflect
|
|
||||||
a variable name change.
|
|
||||||
---
|
|
||||||
js/ui/status/network.js | 2 +-
|
|
||||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
|
|
||||||
index 7990332..4bfbd21 100644
|
|
||||||
--- a/js/ui/status/network.js
|
|
||||||
+++ b/js/ui/status/network.js
|
|
||||||
@@ -1752,7 +1752,7 @@ NMApplet.prototype = {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else
|
|
||||||
- a._primaryDevice = this._vpnDevice;
|
|
||||||
+ a._primaryDevice = this._devices.vpn.device
|
|
||||||
|
|
||||||
if (a._primaryDevice)
|
|
||||||
a._primaryDevice.setActiveConnection(a);
|
|
||||||
--
|
|
||||||
1.7.4.1
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
|||||||
From 3944df1bd24b7295180d33dba9ee7d531c1dddd4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Maxim Ermilov <zaspire@rambler.ru>
|
|
||||||
Date: Tue, 08 Mar 2011 17:15:20 +0000
|
|
||||||
Subject: altTab: fix incorrect positioning with multiple monitors
|
|
||||||
|
|
||||||
Calculate the position of the alt-tab popup correctly when primary.x != 0.
|
|
||||||
This was accidentally broken by 614176b2691981c982e77b8a04b01ff02a670857
|
|
||||||
https://bugzilla.gnome.org/show_bug.cgi?id=644206
|
|
||||||
---
|
|
||||||
diff --git a/js/ui/altTab.js b/js/ui/altTab.js
|
|
||||||
index 44fd39d..46ab9a3 100644
|
|
||||||
--- a/js/ui/altTab.js
|
|
||||||
+++ b/js/ui/altTab.js
|
|
||||||
@@ -87,7 +87,7 @@ AltTabPopup.prototype = {
|
|
||||||
let [childMinHeight, childNaturalHeight] = this._appSwitcher.actor.get_preferred_height(primary.width - hPadding);
|
|
||||||
let [childMinWidth, childNaturalWidth] = this._appSwitcher.actor.get_preferred_width(childNaturalHeight);
|
|
||||||
childBox.x1 = Math.max(primary.x + leftPadding, primary.x + Math.floor((primary.width - childNaturalWidth) / 2));
|
|
||||||
- childBox.x2 = Math.min(primary.width - hPadding, childBox.x1 + childNaturalWidth);
|
|
||||||
+ childBox.x2 = Math.min(primary.x + primary.width - hPadding, childBox.x1 + childNaturalWidth);
|
|
||||||
childBox.y1 = primary.y + Math.floor((primary.height - childNaturalHeight) / 2);
|
|
||||||
childBox.y2 = childBox.y1 + childNaturalHeight;
|
|
||||||
this._appSwitcher.actor.allocate(childBox, flags);
|
|
||||||
--
|
|
||||||
cgit v0.8.3.4
|
|
Loading…
Reference in New Issue
Block a user