Revision

16795

Author

sathieu

Date

2010-02-24 06:06:47 -0600 (Wed, 24 Feb 2010)

Log Message

Skinny: previous commit was incomplete

Modified Paths

• freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c
• freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c

Diff

--- freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c	2010-02-24 12:06:36 UTC (rev 16794)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/mod_skinny.c	2010-02-24 12:06:47 UTC (rev 16795)
@@ -63,7 +63,7 @@
 	"CREATE TABLE skinny_buttons (\n"
 	"   device_name      VARCHAR(16),\n"
 	"   position         INTEGER,\n"
-	"   type         INTEGER,\n"
+	"   type             INTEGER,\n"
 	"   label            VARCHAR(40),\n"
 	"   value            VARCHAR(24),\n"
 	"   settings         VARCHAR(44)\n"

--- freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c	2010-02-24 12:06:36 UTC (rev 16794)
+++ freeswitch/trunk/src/mod/endpoints/mod_skinny/skinny_protocol.c	2010-02-24 12:06:47 UTC (rev 16795)
@@ -1223,13 +1223,13 @@
 
 	if ((sql = switch_mprintf(
 			"SELECT name, user_id, instance, '' AS user_name, '' AS server_name, "
-				"(SELECT COUNT(*) FROM skinny_buttons WHERE device_name='%s' AND type='%s') AS number_lines, "
-				"(SELECT COUNT(*) FROM skinny_buttons WHERE device_name='%s' AND type='%s') AS number_speed_dials "
+				"(SELECT COUNT(*) FROM skinny_buttons WHERE device_name='%s' AND type=%d) AS number_lines, "
+				"(SELECT COUNT(*) FROM skinny_buttons WHERE device_name='%s' AND type=%d) AS number_speed_dials "
 				"FROM skinny_devices WHERE name='%s' ",
 			listener->device_name,
-			skinny_button2str(SKINNY_BUTTON_LINE),
+			SKINNY_BUTTON_LINE,
 			listener->device_name,
-			skinny_button2str(SKINNY_BUTTON_SPEED_DIAL),
+			SKINNY_BUTTON_SPEED_DIAL,
 			listener->device_name
 			))) {
 		skinny_execute_sql_callback(profile, profile->listener_mutex, sql, skinny_config_stat_res_callback, message);