Rename AvailableOperators to Operators

diff --git a/doc/network-api.txt b/doc/network-api.txt
index cc77360..59ce765 100644 (file)
--- 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 3a9c517..868fab9 100644 (file)
--- 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 173d040..7425c8d 100755 (executable)
--- 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 545270b..52ef95a 100755 (executable)
--- 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 86b81fc..071d4f7 100755 (executable)
--- 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 7777499..9a8f3c9 100755 (executable)
--- 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",