From ba3a6ad6c8b268b064a11ec0f51f5b2c5e32a303 Mon Sep 17 00:00:00 2001
From: Mathieu Parent <math.parent@gmail.com>
Date: Sat, 4 Sep 2010 10:14:22 +0200
Subject: [PATCH] Skinny: Rename skinny-default-soft-key-set-set to
 skinny-soft-key-set-set

---
 conf/directory/default/skinny-example.xml    | 2 +-
 src/mod/endpoints/mod_skinny/mod_skinny.h    | 2 +-
 src/mod/endpoints/mod_skinny/skinny_server.c | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf/directory/default/skinny-example.xml b/conf/directory/default/skinny-example.xml
index 8a61ae5be5..357eb72f12 100644
--- a/conf/directory/default/skinny-example.xml
+++ b/conf/directory/default/skinny-example.xml
@@ -3,7 +3,7 @@
    <params>
     <!-- for devices requesting firmware via SCCP, like ATA186
     <param name="skinny-firmware-version" value="ATA030101SCCP04"
-    <param name="skinny-default-soft-key-set-set" value="default"
+    <param name="skinny-soft-key-set-set" value="default"
     -->
     <param name="foo" value="bar"/>
    </params>
diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.h b/src/mod/endpoints/mod_skinny/mod_skinny.h
index 3dec3e9abb..bbd318b746 100644
--- a/src/mod/endpoints/mod_skinny/mod_skinny.h
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.h
@@ -135,7 +135,7 @@ struct listener {
     uint32_t device_type;
     
 	char firmware_version[16];
-	char *default_soft_key_set_set;
+	char *soft_key_set_set;
 
     switch_socket_t *sock;
     switch_memory_pool_t *pool;
diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index 7325a6cb5f..3fa4aab6c4 100644
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -999,8 +999,8 @@ switch_status_t skinny_handle_register(listener_t *listener, skinny_message_t *r
 				const char *value = switch_xml_attr_soft(xparam, "value");
 				if (!strcasecmp(name, "skinny-firmware-version")) {
 					strncpy(listener->firmware_version, value, 16);
-				} else if (!strcasecmp(name, "skinny-default-soft-key-set-set")) {
-					listener->default_soft_key_set_set = switch_core_strdup(profile->pool, value);
+				} else if (!strcasecmp(name, "skinny-soft-key-set-set")) {
+					listener->soft_key_set_set = switch_core_strdup(profile->pool, value);
 				}
 			}
 		}
@@ -1697,8 +1697,8 @@ switch_status_t skinny_handle_soft_key_set_request(listener_t *listener, skinny_
 {
 	skinny_message_t *message = NULL;
 
-	if (listener->default_soft_key_set_set) {
-		message = switch_core_hash_find(listener->profile->soft_key_set_sets_hash, listener->default_soft_key_set_set);
+	if (listener->soft_key_set_set) {
+		message = switch_core_hash_find(listener->profile->soft_key_set_sets_hash, listener->soft_key_set_set);
 	}
 	if (!message) {
 		message = switch_core_hash_find(listener->profile->soft_key_set_sets_hash, "default");