[PATCH 1/4] call-settings: fix getting CNAP property

[PATCH 1/4] call-settings: fix getting CNAP property

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 621 bytes --]

---
 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

[PATCH 2/4] call-settings: rename CalledLine* properties

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 2107 bytes --]

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.
---
 src/call-settings.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/call-settings.c b/src/call-settings.c
index aea4991..4dac2b6 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);
-- 
1.7.3.4

[PATCH 3/4] doc: rename CalledLine* properties

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 1762 bytes --]

---
 doc/call-settings-api.txt         |    4 ++--
 doc/supplementaryservices-api.txt |    4 ++--
 2 files changed, 4 insertions(+), 4 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
diff --git a/doc/supplementaryservices-api.txt b/doc/supplementaryservices-api.txt
index 0857412..820cce1 100644
--- a/doc/supplementaryservices-api.txt
+++ b/doc/supplementaryservices-api.txt
@@ -89,9 +89,9 @@ The first return argument and the corresponding second return argument are:
 					dict cf_dict)
 	"CallWaiting"			(string ss_op, dict cw_dict)
 	"CallingLinePresentation"	(string ss_op, string status)
-	"CalledLinePresentation"	(string ss_op, string status)
+	"ConnectedLinePresentation"	(string ss_op, string status)
 	"CallingLineRestriction"	(string ss_op, string clir_status)
-	"CalledLineRestriction"		(string ss_op, string status)
+	"ConnectedLineRestriction"	(string ss_op, string status)
 
 ss_op contains the supplementary service operation:
 
-- 
1.7.3.4

[PATCH 4/4] test: use new names for CalledLine* properties

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 1160 bytes --]

---
 test/test-call-settings |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test-call-settings b/test/test-call-settings
index 60fe3ba..3258da7 100755
--- a/test/test-call-settings
+++ b/test/test-call-settings
@@ -42,14 +42,14 @@ if __name__ == "__main__":
 	print "Current Property values:"
 	print "Network Status of Call Waiting - Voice: %s" %\
 		(properties['VoiceCallWaiting'])
-	print "Network Status of Called Line Restriction: %s" %\
-		(properties['CalledLineRestriction'])
+	print "Network Status of Connected Line Restriction: %s" %\
+		(properties['ConnectedLineRestriction'])
 	print "Network Status of Calling Line Restriction: %s" %\
 		(properties['CallingLineRestriction'])
 	print "Network Status of Calling Line Presentation: %s" %\
 		(properties['CallingLinePresentation'])
-	print "Network Status of Called Line Presentation: %s" %\
-		(properties['CalledLinePresentation'])
+	print "Network Status of Connected Line Presentation: %s" %\
+		(properties['ConnectedLinePresentation'])
 	print "Hide my Caller Id: %s" % (properties['HideCallerId'])
 
 	try:
-- 
1.7.3.4

Re: [PATCH 1/4] call-settings: fix getting CNAP property

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

Hi Lucas,

On 12/28/2010 08:40 PM, Lucas De Marchi wrote:
> ---
>  src/call-settings.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 

Good catch.  Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 2/4] call-settings: rename CalledLine* properties

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

Hi Lucas,

On 12/28/2010 08:41 PM, Lucas De Marchi wrote:
> 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.
> ---
>  src/call-settings.c |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 3/4] doc: rename CalledLine* properties

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 280 bytes --]

Hi Lucas,

On 12/28/2010 08:41 PM, Lucas De Marchi wrote:
> ---
>  doc/call-settings-api.txt         |    4 ++--
>  doc/supplementaryservices-api.txt |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 4/4] test: use new names for CalledLine* properties

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

Hi Lucas,

On 12/28/2010 08:41 PM, Lucas De Marchi wrote:
> ---
>  test/test-call-settings |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis