summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2010-03-25 10:37:46 -0500
committerDenis Kenzior <denkenz@gmail.com>2010-03-25 10:37:46 -0500
commit77693b697d1796f67f998b8bba0542398f5079f9 (patch)
treef829625a55fd95264f76acbcb910663b96f8cd4b
parent1e783b33d94e88c4f53e96609cbd4bca0c5e396c (diff)
downloadofono-77693b697d1796f67f998b8bba0542398f5079f9.tar.bz2
Rename AvailableOperators to Operators
-rw-r--r--doc/network-api.txt2
-rw-r--r--src/network.c4
-rwxr-xr-xtest/list-modems2
-rwxr-xr-xtest/list-operators2
-rwxr-xr-xtest/monitor-ofono2
-rwxr-xr-xtest/test-network-registration2
6 files changed, 7 insertions, 7 deletions
diff --git a/doc/network-api.txt b/doc/network-api.txt
index cc77360a..59ce7655 100644
--- a/doc/network-api.txt
+++ b/doc/network-api.txt
@@ -131,7 +131,7 @@ Properties string Mode [readonly]
unavailable, this property will not be returned by
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
telephony stack. The scanning for new operators is
diff --git a/src/network.c b/src/network.c
index 3a9c5175..868fab9b 100644
--- a/src/network.c
+++ b/src/network.c
@@ -363,7 +363,7 @@ static void network_operator_emit_available_operators(struct ofono_netreg *netre
ofono_dbus_signal_array_property_changed(conn, path,
OFONO_NETWORK_REGISTRATION_INTERFACE,
- "AvailableOperators",
+ "Operators",
DBUS_TYPE_OBJECT_PATH,
&network_operators);
@@ -781,7 +781,7 @@ static DBusMessage *network_get_properties(DBusConnection *conn,
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,
&network_operators);
diff --git a/test/list-modems b/test/list-modems
index 173d0400..7425c8d9 100755
--- a/test/list-modems
+++ b/test/list-modems
@@ -38,7 +38,7 @@ for path in properties["Modems"]:
continue
for key in properties.keys():
- if key in ["AvailableOperators", "Calls",
+ if key in ["Operators", "Calls",
"MultipartyCalls",
"EmergencyNumbers",
"SubscriberNumbers",
diff --git a/test/list-operators b/test/list-operators
index 545270b4..52ef95a0 100755
--- a/test/list-operators
+++ b/test/list-operators
@@ -25,7 +25,7 @@ for path in properties["Modems"]:
properties = netreg.GetProperties()
- for path in properties["AvailableOperators"]:
+ for path in properties["Operators"]:
operator = dbus.Interface(bus.get_object('org.ofono', path),
'org.ofono.NetworkOperator')
diff --git a/test/monitor-ofono b/test/monitor-ofono
index 86b81fc3..071d4f76 100755
--- a/test/monitor-ofono
+++ b/test/monitor-ofono
@@ -10,7 +10,7 @@ def property_changed(name, value, path, interface):
if name in ["Modems", "Interfaces",
"Technologies",
"SubscriberNumbers",
- "AvailableOperators",
+ "Operators",
"PreferredLanguages"]:
val = ""
for i in value:
diff --git a/test/test-network-registration b/test/test-network-registration
index 7777499e..9a8f3c91 100755
--- a/test/test-network-registration
+++ b/test/test-network-registration
@@ -54,7 +54,7 @@ if __name__ == "__main__":
if props.has_key('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),
'org.ofono.NetworkOperator')
op.connect_to_signal("PropertyChanged",