[gnome-shell] ModemManager: fix dbus parameters
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] ModemManager: fix dbus parameters
- Date: Mon, 13 Feb 2012 18:41:12 +0000 (UTC)
commit 7705a65beb3fbfc0ae1eb473a0b88c4895020d9e
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Thu Jan 12 19:41:02 2012 +0100
ModemManager: fix dbus parameters
Gsm.GetRegistrationInfo and Cdma.GetServingSystem return a single argument
consisting of a tuple, not three separate arguments. This is
a regression from the GDBus port.
https://bugzilla.gnome.org/show_bug.cgi?id=670005
js/misc/modemManager.js | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js
index 654ee37..35b80b1 100644
--- a/js/misc/modemManager.js
+++ b/js/misc/modemManager.js
@@ -10,9 +10,7 @@ const Signals = imports.signals;
const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
<method name="GetRegistrationInfo">
- <arg type="u" direction="out" />
- <arg type="s" direction="out" />
- <arg type="s" direction="out" />
+ <arg type="(uss)" direction="out" />
</method>
<method name="GetSignalQuality">
<arg type="u" direction="out" />
@@ -35,9 +33,7 @@ const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.C
<arg type="u" direction="out" />
</method>
<method name="GetServingSystem">
- <arg type="u" direction="out" />
- <arg type="s" direction="out" />
- <arg type="u" direction="out" />
+ <arg type="(usu)" direction="out" />
</method>
<signal name="SignalQuality">
<arg type="u" direction="out" />
@@ -72,7 +68,7 @@ const ModemGsm = new Lang.Class({
this.operator_name = this._findOperatorName(name, code);
this.emit('notify::operator-name');
}));
- this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function(result, err) {
+ this._proxy.GetRegistrationInfoRemote(Lang.bind(this, function([result], err) {
if (err) {
log(err);
return;
@@ -187,7 +183,7 @@ const ModemCdma = new Lang.Class({
},
_refreshServingSystem: function() {
- this._proxy.GetServingSystemRemote(Lang.bind(this, function(result, err) {
+ this._proxy.GetServingSystemRemote(Lang.bind(this, function([result], err) {
if (err) {
// it will return an error if the device is not connected
this.operator_name = null;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]