mirror of git://git.sysmocom.de/ofono
Rename AvailableOperators to Operators
This commit is contained in:
parent
1e783b33d9
commit
77693b697d
|
@ -131,7 +131,7 @@ Properties string Mode [readonly]
|
||||||
unavailable, this property will not be returned by
|
unavailable, this property will not be returned by
|
||||||
GetProperties or will be set to an empty string.
|
GetProperties or will be set to an empty string.
|
||||||
|
|
||||||
array{object} AvailableOperators [readonly]
|
array{object} Operators [readonly]
|
||||||
|
|
||||||
List of all operator object paths known to the
|
List of all operator object paths known to the
|
||||||
telephony stack. The scanning for new operators is
|
telephony stack. The scanning for new operators is
|
||||||
|
|
|
@ -363,7 +363,7 @@ static void network_operator_emit_available_operators(struct ofono_netreg *netre
|
||||||
|
|
||||||
ofono_dbus_signal_array_property_changed(conn, path,
|
ofono_dbus_signal_array_property_changed(conn, path,
|
||||||
OFONO_NETWORK_REGISTRATION_INTERFACE,
|
OFONO_NETWORK_REGISTRATION_INTERFACE,
|
||||||
"AvailableOperators",
|
"Operators",
|
||||||
DBUS_TYPE_OBJECT_PATH,
|
DBUS_TYPE_OBJECT_PATH,
|
||||||
&network_operators);
|
&network_operators);
|
||||||
|
|
||||||
|
@ -781,7 +781,7 @@ static DBusMessage *network_get_properties(DBusConnection *conn,
|
||||||
|
|
||||||
network_operator_populate_registered(netreg, &network_operators);
|
network_operator_populate_registered(netreg, &network_operators);
|
||||||
|
|
||||||
ofono_dbus_dict_append_array(&dict, "AvailableOperators",
|
ofono_dbus_dict_append_array(&dict, "Operators",
|
||||||
DBUS_TYPE_OBJECT_PATH,
|
DBUS_TYPE_OBJECT_PATH,
|
||||||
&network_operators);
|
&network_operators);
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ for path in properties["Modems"]:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
for key in properties.keys():
|
for key in properties.keys():
|
||||||
if key in ["AvailableOperators", "Calls",
|
if key in ["Operators", "Calls",
|
||||||
"MultipartyCalls",
|
"MultipartyCalls",
|
||||||
"EmergencyNumbers",
|
"EmergencyNumbers",
|
||||||
"SubscriberNumbers",
|
"SubscriberNumbers",
|
||||||
|
|
|
@ -25,7 +25,7 @@ for path in properties["Modems"]:
|
||||||
|
|
||||||
properties = netreg.GetProperties()
|
properties = netreg.GetProperties()
|
||||||
|
|
||||||
for path in properties["AvailableOperators"]:
|
for path in properties["Operators"]:
|
||||||
operator = dbus.Interface(bus.get_object('org.ofono', path),
|
operator = dbus.Interface(bus.get_object('org.ofono', path),
|
||||||
'org.ofono.NetworkOperator')
|
'org.ofono.NetworkOperator')
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ def property_changed(name, value, path, interface):
|
||||||
if name in ["Modems", "Interfaces",
|
if name in ["Modems", "Interfaces",
|
||||||
"Technologies",
|
"Technologies",
|
||||||
"SubscriberNumbers",
|
"SubscriberNumbers",
|
||||||
"AvailableOperators",
|
"Operators",
|
||||||
"PreferredLanguages"]:
|
"PreferredLanguages"]:
|
||||||
val = ""
|
val = ""
|
||||||
for i in value:
|
for i in value:
|
||||||
|
|
|
@ -54,7 +54,7 @@ if __name__ == "__main__":
|
||||||
if props.has_key('Technology'):
|
if props.has_key('Technology'):
|
||||||
print "Technology: '%s'" % (props['Technology'])
|
print "Technology: '%s'" % (props['Technology'])
|
||||||
|
|
||||||
for path in props['AvailableOperators']:
|
for path in props['Operators']:
|
||||||
op = dbus.Interface(bus.get_object('org.ofono', path),
|
op = dbus.Interface(bus.get_object('org.ofono', path),
|
||||||
'org.ofono.NetworkOperator')
|
'org.ofono.NetworkOperator')
|
||||||
op.connect_to_signal("PropertyChanged",
|
op.connect_to_signal("PropertyChanged",
|
||||||
|
|
Loading…
Reference in New Issue