6:22 a.m.
---
src/call-settings.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/call-settings.c b/src/call-settings.c
index b6c3924..aea4991 100644
--- a/src/call-settings.c
+++ b/src/call-settings.c
@@ -870,7 +870,7 @@ static DBusMessage *generate_get_properties_reply(struct
ofono_call_settings *cs
ofono_dbus_dict_append(&dict, "CallingLinePresentation",
DBUS_TYPE_STRING, &str);
- str = cnap_status_to_string(cs->clip);
+ str = cnap_status_to_string(cs->cnap);
ofono_dbus_dict_append(&dict, "CallingNamePresentation",
DBUS_TYPE_STRING, &str);
--
1.7.3.4
6:22 a.m.
New subject: [PATCH 2/3] call-settings: rename CalledLine* properties
COLP and COLR are better named respectively as ConnectedLinePresentaion
and ConnectedLineRestriction as stated in 27.007 sections 7.8 and 7.31.
CalledLine* name will be used in future for CDIP.
---
src/call-settings.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/call-settings.c b/src/call-settings.c
index aea4991..12c4712 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,15 +875,15 @@ 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);
- ofono_dbus_dict_append(&dict, "CallingLineRestriction",
+ ofono_dbus_dict_append(&dict, "ConnectedLineRestriction",
DBUS_TYPE_STRING, &str);
str = hide_callerid_to_string(cs->clir_setting);
--
1.7.3.4
7:39 a.m.
New subject: [PATCH 2/3] call-settings: rename CalledLine* properties
Hi Lucas,
COLP and COLR are better named respectively as
ConnectedLinePresentaion
and ConnectedLineRestriction as stated in 27.007 sections 7.8 and 7.31.
don't forget the scripts in the test directory.
Regards
Marcel
9:16 a.m.
New subject: [PATCH 2/3] call-settings: rename CalledLine* properties
Hi Marcel,
On Tue, Dec 28, 2010 at 6:39 PM, Marcel Holtmann <marcel(a)holtmann.org> wrote:
Hi Lucas,
> COLP and COLR are better named respectively as ConnectedLinePresentaion
> and ConnectedLineRestriction as stated in 27.007 sections 7.8 and 7.31.
don't forget the scripts in the test directory.
Oh! Right... There was a typo in the commit message too. I'll fix that
and re-send.
Thanks,
Lucas De Marchi
6:22 a.m.
New subject: [PATCH 3/3] doc: rename CalledLine* properties in call-settings
---
doc/call-settings-api.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/call-settings-api.txt b/doc/call-settings-api.txt
index a454621..b6dc1cc 100644
--- a/doc/call-settings-api.txt
+++ b/doc/call-settings-api.txt
@@ -42,7 +42,7 @@ Properties string CallingLinePresentation [readonly]
"enabled",
"unknown"
- string CalledLinePresentation [readonly]
+ string ConnectedLinePresentation [readonly]
Contains the value of the connected line identification
presentation property. The value indicates the state
@@ -54,7 +54,7 @@ Properties string CallingLinePresentation [readonly]
"enabled",
"unknown"
- string CalledLineRestriction [readonly]
+ string ConnectedLineRestriction [readonly]
Contains the value of the connected line identification
restriction property. The value indicates the state of
--
1.7.3.4
4282
days inactive
4282
days old
4 comments
2 participants
participants (2)
-
Lucas De Marchi -
Marcel Holtmann