diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2010-03-25 10:57:52 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-03-25 10:57:52 -0500 |
| commit | e05318aa5a0a7c912a8197d18eb124b6120d6a98 (patch) | |
| tree | ec1dae31767cc4a4356ebb6247d562c282f18d25 | |
| parent | 92beff283967f49296361925f7ee318b8797aa03 (diff) | |
| download | ofono-e05318aa5a0a7c912a8197d18eb124b6120d6a98.tar.bz2 | |
Refactor: Rename netreg Operator property to Name
| -rw-r--r-- | doc/network-api.txt | 2 | ||||
| -rw-r--r-- | src/network.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/network-api.txt b/doc/network-api.txt index 59ce7655..8782942b 100644 --- a/doc/network-api.txt +++ b/doc/network-api.txt @@ -105,7 +105,7 @@ Properties string Mode [readonly] TODO: Values for CDMA and EVDO based networks. - string Operator [readonly] + string Name [readonly] Contains the current operator name, suitable for display on the idle screen or an empty string if diff --git a/src/network.c b/src/network.c index 868fab9b..b2e5821c 100644 --- a/src/network.c +++ b/src/network.c @@ -509,7 +509,7 @@ static void set_network_operator_name(struct network_operator_data *opd, ofono_dbus_signal_property_changed(conn, path, OFONO_NETWORK_REGISTRATION_INTERFACE, - "Operator", DBUS_TYPE_STRING, + "Name", DBUS_TYPE_STRING, &operator); } @@ -563,7 +563,7 @@ static void set_network_operator_eons_info(struct network_operator_data *opd, ofono_dbus_signal_property_changed(conn, npath, OFONO_NETWORK_REGISTRATION_INTERFACE, - "Operator", DBUS_TYPE_STRING, + "Name", DBUS_TYPE_STRING, &operator); } } @@ -777,7 +777,7 @@ static DBusMessage *network_get_properties(DBusConnection *conn, } operator = get_operator_display_name(netreg); - ofono_dbus_dict_append(&dict, "Operator", DBUS_TYPE_STRING, &operator); + ofono_dbus_dict_append(&dict, "Name", DBUS_TYPE_STRING, &operator); network_operator_populate_registered(netreg, &network_operators); @@ -1276,7 +1276,7 @@ emit: ofono_dbus_signal_property_changed(conn, path, OFONO_NETWORK_REGISTRATION_INTERFACE, - "Operator", DBUS_TYPE_STRING, + "Name", DBUS_TYPE_STRING, &operator); notify_status_watches(netreg); @@ -1469,7 +1469,7 @@ static void sim_spdi_read_cb(int ok, int length, int record, ofono_dbus_signal_property_changed(conn, path, OFONO_NETWORK_REGISTRATION_INTERFACE, - "Operator", DBUS_TYPE_STRING, + "Name", DBUS_TYPE_STRING, &operator); } } @@ -1534,7 +1534,7 @@ static void sim_spn_read_cb(int ok, int length, int record, ofono_dbus_signal_property_changed(conn, path, OFONO_NETWORK_REGISTRATION_INTERFACE, - "Operator", DBUS_TYPE_STRING, + "Name", DBUS_TYPE_STRING, &operator); } } |