Skinny: previous commit was incomplete

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16795 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index d46147448de66fcdd88a0ab5a889b193d7075fa1..b0c8d6d6cb487c2c9a2b44451170887bf82f511c 100644 (file)
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -63,7 +63,7 @@ static char buttons_sql[] =
        "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"

diff --git a/src/mod/endpoints/mod_skinny/skinny_protocol.c b/src/mod/endpoints/mod_skinny/skinny_protocol.c
index 9b9360c42217faa5e001b58b6c25229577e1f5f8..2e6021f25bd60b6c173bbdd34790fc59d60ae630 100644 (file)
--- a/src/mod/endpoints/mod_skinny/skinny_protocol.c
+++ b/src/mod/endpoints/mod_skinny/skinny_protocol.c
@@ -1223,13 +1223,13 @@ switch_status_t skinny_handle_config_stat_request(listener_t *listener, skinny_m
 
        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);