From 94bd0de72d3adab7869e9faff5400df7f76d3768 Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Fri, 13 Apr 2007 22:15:52 +0000
Subject: [PATCH] Fixed incomplete integration of shell server log gui.

---
 apps/telnetd/telnetd.c | 12 +++++++-----
 apps/telnetd/telnetd.h |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/telnetd/telnetd.c b/apps/telnetd/telnetd.c
index e2e47b332..50de471c4 100644
--- a/apps/telnetd/telnetd.c
+++ b/apps/telnetd/telnetd.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki desktop OS.
  *
- * $Id: telnetd.c,v 1.3 2007/04/13 22:02:28 oliverschmidt Exp $
+ * $Id: telnetd.c,v 1.4 2007/04/13 22:15:52 oliverschmidt Exp $
  *
  */
 
@@ -147,6 +147,9 @@ shell_output(char *str1, char *str2)
   static unsigned len;
   char *line;
 
+#if TELNETD_CONF_GUI
+  telnetd_gui_output(str1, str2);
+#endif /* TELNETD_CONF_GUI */
   line = alloc_line();
   if(line != NULL) {
     len = (unsigned int)strlen(str1);
@@ -172,6 +175,9 @@ PROCESS_THREAD(telnetd_process, ev, data)
   tcp_listen(HTONS(23));
   memb_init(&linemem);
   shell_init();
+#if TELNETD_CONF_GUI
+  telnetd_gui_init();
+#endif /* TELNETD_CONF_GUI */
 
   while(1) {
     PROCESS_WAIT_EVENT();
@@ -283,7 +289,6 @@ newdata(void)
   u16_t len;
   u8_t c;
     
-  
   len = uip_datalen();
   
   while(len > 0 && s.bufptr < sizeof(s.buf)) {
@@ -344,10 +349,7 @@ newdata(void)
       }
       break;
     }
-
-    
   }
-  
 }
 /*-----------------------------------------------------------------------------------*/
 void
diff --git a/apps/telnetd/telnetd.h b/apps/telnetd/telnetd.h
index c347a2d85..dc28ba456 100644
--- a/apps/telnetd/telnetd.h
+++ b/apps/telnetd/telnetd.h
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: telnetd.h,v 1.1 2006/06/17 22:41:13 adamdunkels Exp $
+ * $Id: telnetd.h,v 1.2 2007/04/13 22:15:52 oliverschmidt Exp $
  *
  */
 #ifndef __TELNETD_H__
@@ -42,6 +42,7 @@ PROCESS_NAME(telnetd_process);
 
 void telnetd_gui_eventhandler(process_event_t ev, process_data_t data);
 void telnetd_appcall(void *data);
+void telnetd_gui_init(void);
 void telnetd_gui_output(char *str1, char *str2);
 void telnetd_gui_quit(void);
 void telnetd_quit(void);