[gnome-shell] power: Remove _checkError()
- From: Florian MÃllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] power: Remove _checkError()
- Date: Wed, 13 Jul 2011 17:46:26 +0000 (UTC)
commit fda4fc674d701a73bca6b9249f9eef7be10e3d1b
Author: Florian MÃllner <fmuellner gnome org>
Date: Sat Jul 9 17:23:03 2011 +0200
power: Remove _checkError()
On error, we tried to kill and respawn gnome-power-manager, but
as of commit c5676900 the DBus interface provided by g-s-d's power
plugin is used, so the respawning does not have any effect.
https://bugzilla.gnome.org/show_bug.cgi?id=654300
js/ui/status/power.js | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index fe757ec..a64a2ba 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -93,7 +93,6 @@ Indicator.prototype = {
_readPrimaryDevice: function() {
this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(device, error) {
if (error) {
- this._checkError(error);
this._hasPrimary = false;
this._primaryDeviceId = null;
this._batteryItem.actor.hide();
@@ -145,7 +144,6 @@ Indicator.prototype = {
this._deviceItems = [];
if (error) {
- this._checkError(error);
this._deviceSep.actor.hide();
return;
}
@@ -176,21 +174,12 @@ Indicator.prototype = {
this.setGIcon(gicon);
this.actor.show();
} else {
- this._checkError(error);
this.menu.close();
this.actor.hide();
}
}));
this._readPrimaryDevice();
this._readOtherDevices();
- },
-
- _checkError: function(error) {
- if (!this._restarted && error && error.message.match(/org\.freedesktop\.DBus\.Error\.(UnknownMethod|InvalidArgs)/)) {
- Util.killall('gnome-power-manager');
- Util.spawn(['gnome-power-manager']);
- this._restarted = true;
- }
}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]