summaryrefslogtreecommitdiffstats
path: root/src/call-settings.c
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2010-12-29 00:41:00 -0200
committerDenis Kenzior <denkenz@gmail.com>2010-12-30 11:15:42 -0600
commit53b5935455e1f346220aef3bc638710637ee592d (patch)
tree4803cf5321ce5a9a98cef8c2a8a471ac13bf7426 /src/call-settings.c
parent3b58a08eaa101539aa50fa3d1737e48ec5029184 (diff)
downloadofono-53b5935455e1f346220aef3bc638710637ee592d.tar.bz2
call-settings: rename CalledLine* properties
COLP and COLR are better named respectively as ConnectedLinePresentation and ConnectedLineRestriction as stated in 27.007 sections 7.8 and 7.31. CalledLine* name will be used in future for CDIP.
Diffstat (limited to 'src/call-settings.c')
-rw-r--r--src/call-settings.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/call-settings.c b/src/call-settings.c
index aea49914..4dac2b6d 100644
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -289,7 +289,7 @@ static void set_colp(struct ofono_call_settings *cs, int colp)
ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_SETTINGS_INTERFACE,
- "CalledLinePresentation",
+ "ConnectedLinePresentation",
DBUS_TYPE_STRING, &str);
}
@@ -311,7 +311,7 @@ static void set_colr(struct ofono_call_settings *cs, int colr)
ofono_dbus_signal_property_changed(conn, path,
OFONO_CALL_SETTINGS_INTERFACE,
- "CalledLineRestriction",
+ "ConnectedLineRestriction",
DBUS_TYPE_STRING, &str);
}
@@ -595,13 +595,13 @@ static void clip_cnap_colp_colr_ss_query_cb(const struct ofono_error *error,
case CALL_SETTING_TYPE_COLP:
set_colp(cs, status);
value = colp_status_to_string(status);
- context = "CalledLinePresentation";
+ context = "ConnectedLinePresentation";
break;
case CALL_SETTING_TYPE_COLR:
set_colr(cs, status);
value = colr_status_to_string(status);
- context = "CalledLineRestriction";
+ context = "ConnectedLineRestriction";
break;
default:
@@ -875,11 +875,11 @@ static DBusMessage *generate_get_properties_reply(struct ofono_call_settings *cs
DBUS_TYPE_STRING, &str);
str = colp_status_to_string(cs->colp);
- ofono_dbus_dict_append(&dict, "CalledLinePresentation",
+ ofono_dbus_dict_append(&dict, "ConnectedLinePresentation",
DBUS_TYPE_STRING, &str);
str = colr_status_to_string(cs->colr);
- ofono_dbus_dict_append(&dict, "CalledLineRestriction",
+ ofono_dbus_dict_append(&dict, "ConnectedLineRestriction",
DBUS_TYPE_STRING, &str);
str = clir_status_to_string(cs->clir);