6 files changed, 4 insertions, 20 deletions
diff --git a/sesman/chansrv/devredir.c b/sesman/chansrv/devredir.c
index 111ac465..a8377e7d 100644
--- a/sesman/chansrv/devredir.c
+++ b/sesman/chansrv/devredir.c
@@ -46,6 +46,7 @@
 #include "parse.h"
 #include "os_calls.h"
 #include "log.h"
+#include "chansrv.h"
 #include "chansrv_fuse.h"
 #include "devredir.h"
 #include "smartcard.h"
@@ -698,9 +699,8 @@ void devredir_proc_client_devlist_announce_req(struct stream *s)
 
                 /* for smart cards, device data len always 0 */
 
-                log_debug("device_type=SMARTCARD device_id=0x%x dosname=%s "
-                          "device_data_len=%d",
-                          g_device_id, preferred_dos_name, device_data_len);
+                log_debug("device_type=SMARTCARD device_id=0x%x dosname=%s",
+                          g_device_id, preferred_dos_name);
 
                 devredir_send_server_device_announce_resp(g_device_id);
                 scard_device_announce(g_device_id);
diff --git a/sesman/chansrv/devredir.h b/sesman/chansrv/devredir.h
index 76900698..cbe279db 100644
--- a/sesman/chansrv/devredir.h
+++ b/sesman/chansrv/devredir.h
@@ -112,8 +112,6 @@ dev_redir_file_write(void *fusep, tui32 DeviceId, tui32 FileId,
 int APP_CC
 devredir_rmdir_or_file(void *fusep, tui32 device_id, const char *path, int mode);
 
-int send_channel_data(int chan_id, char *data, int size);
-
 /*
  * RDPDR_HEADER definitions
  */
diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c
index f7e68b08..e790a76b 100644
--- a/sesman/chansrv/rail.c
+++ b/sesman/chansrv/rail.c
@@ -612,9 +612,6 @@ rail_process_activate(struct stream *s, int size)
         LOG(10, ("chansrv::rail_process_activate: calling XSetInputFocus 0x%8.8x", window_id));
         XSetInputFocus(g_display, window_id, RevertToParent, CurrentTime);
     } else {
-        XWindowAttributes window_attributes;
-        XGetWindowAttributes(g_display, window_id, &window_attributes);
-
         LOG(10, ("  window attributes: override_redirect %d",
                  window_attributes.override_redirect));
         add_timeout(200, my_timeout, (void*)(long)g_focus_counter);
diff --git a/sesman/config.c b/sesman/config.c
index 0c169938..39849bc5 100644
--- a/sesman/config.c
+++ b/sesman/config.c
@@ -357,7 +357,7 @@ config_read_sessions(int file, struct config_sessions *se, struct list *param_n,
     g_printf("\tX11DisplayOffset:            %i\r\n", se->x11_display_offset);
     g_printf("\tKillDisconnected:            %i\r\n", se->kill_disconnected);
     g_printf("\tIdleTimeLimit:               %i\r\n", se->max_idle_time);
-    g_printf("\tDisconnectedTimeLimit:       %i\r\n", se->max_idle_time);
+    g_printf("\tDisconnectedTimeLimit:       %i\r\n", se->max_disc_time);
     g_printf("\tPolicy:       %i\r\n", se->policy);
 
     return 0;
diff --git a/sesman/libscp/libscp_v1c.c b/sesman/libscp/libscp_v1c.c
index 7bc9a1d3..14f3bb0f 100644
--- a/sesman/libscp/libscp_v1c.c
+++ b/sesman/libscp/libscp_v1c.c
@@ -136,13 +136,6 @@ scp_v1c_resend_credentials(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
     return _scp_v1c_check_response(c, s);
 }
 
-/* 021 */
-enum SCP_CLIENT_STATES_E
-scp_v1c_pwd_change(struct SCP_CONNECTION *c, char *newpass);
-/* 022 */
-enum SCP_CLIENT_STATES_E
-scp_v1c_pwd_change_cancel(struct SCP_CONNECTION *c);
-
 /* 041 */
 enum SCP_CLIENT_STATES_E
 scp_v1c_get_session_list(struct SCP_CONNECTION *c, int *scount,
diff --git a/sesman/libscp/libscp_v1c_mng.h b/sesman/libscp/libscp_v1c_mng.h
index 126c9113..256ca491 100644
--- a/sesman/libscp/libscp_v1c_mng.h
+++ b/sesman/libscp/libscp_v1c_mng.h
@@ -52,8 +52,4 @@ enum SCP_CLIENT_STATES_E
 scp_v1c_mng_get_session_list(struct SCP_CONNECTION* c, int* scount,
                          struct SCP_DISCONNECTED_SESSION** s);
 
-/* 044 */
-enum SCP_CLIENT_STATES_E
-scp_v1c_select_session_cancel(struct SCP_CONNECTION* c);
-
 #endif