isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ModemManager: fix dbus parameters

Browse Source 
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
This commit is contained in:
Giovanni Campagna 2012-01-12 19:41:02 +01:00
parent 604e8f4f8a
commit 7705a65beb
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/misc/modemManager.js
View File

@ -10,9 +10,7 @@ const Signals = imports.signals;
const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network"> const ModemGsmNetworkInterface = <interface name="org.freedesktop.ModemManager.Modem.Gsm.Network">
<method name="GetRegistrationInfo"> <method name="GetRegistrationInfo">
<arg type="u" direction="out" /> <arg type="(uss)" direction="out" />
<arg type="s" direction="out" />
<arg type="s" direction="out" />
</method> </method>
<method name="GetSignalQuality"> <method name="GetSignalQuality">
<arg type="u" direction="out" /> <arg type="u" direction="out" />
@ -35,9 +33,7 @@ const ModemCdmaInterface = <interface name="org.freedesktop.ModemManager.Modem.C
<arg type="u" direction="out" /> <arg type="u" direction="out" />
</method> </method>
<method name="GetServingSystem"> <method name="GetServingSystem">
<arg type="u" direction="out" /> <arg type="(usu)" direction="out" />
<arg type="s" direction="out" />
<arg type="u" direction="out" />
</method> </method>
<signal name="SignalQuality"> <signal name="SignalQuality">
<arg type="u" direction="out" /> <arg type="u" direction="out" />
@ -72,7 +68,7 @@ const ModemGsm = new Lang.Class({
this.operator_name = this._findOperatorName(name, code); this.operator_name = this._findOperatorName(name, code);
this.emit('notify::operator-name'); 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) { if (err) {
log(err); log(err);
return; return;
@ -187,7 +183,7 @@ const ModemCdma = new Lang.Class({
}, },
_refreshServingSystem: function() { _refreshServingSystem: function() {
this._proxy.GetServingSystemRemote(Lang.bind(this, function(result, err) { this._proxy.GetServingSystemRemote(Lang.bind(this, function([result], err) {
if (err) { if (err) {
// it will return an error if the device is not connected // it will return an error if the device is not connected
this.operator_name = null; this.operator_name = null;