From a1f11ff8e786f752f755a8b94099312c2fd32a1b Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Mon, 19 Nov 2007 12:23:02 +0000
Subject: [PATCH] Removed includes for stuff that has been moved to the
 backyard. Added <stdint.h> include

---
 platform/gtk/Makefile.gtk             | 2 +-
 platform/gtk/contiki-conf.h           | 2 +-
 platform/gtk/contiki-main.c           | 5 +----
 platform/gtk/ctk/ctk-gtksim-service.c | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/platform/gtk/Makefile.gtk b/platform/gtk/Makefile.gtk
index ffe6b0788..3ad19f412 100644
--- a/platform/gtk/Makefile.gtk
+++ b/platform/gtk/Makefile.gtk
@@ -2,7 +2,7 @@ ifndef CONTIKI
   $(error CONTIKI not defined! You must specify where CONTIKI resides!)
 endif
 
-APPS+=process-list webserver program-handler editor irc calc webbrowser email \
+APPS+=process-list webserver program-handler irc calc webbrowser email \
       shell netconf dhcp ftp
 
 CONTIKI_TARGET_DIRS = . ctk net
diff --git a/platform/gtk/contiki-conf.h b/platform/gtk/contiki-conf.h
index 1cee8e733..6358a382f 100644
--- a/platform/gtk/contiki-conf.h
+++ b/platform/gtk/contiki-conf.h
@@ -15,7 +15,7 @@
 typedef unsigned long clock_time_t;
 #define CLOCK_CONF_SECOND 1000
 
-
+#include <stdint.h>
 
 #include "ctk/ctk-arch.h"
 
diff --git a/platform/gtk/contiki-main.c b/platform/gtk/contiki-main.c
index e7b773317..5f726d9f4 100644
--- a/platform/gtk/contiki-main.c
+++ b/platform/gtk/contiki-main.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: contiki-main.c,v 1.7 2007/05/23 22:03:41 oliverschmidt Exp $
+ * $Id: contiki-main.c,v 1.8 2007/11/19 12:23:02 adamdunkels Exp $
  *
  */
 
@@ -43,7 +43,6 @@
 #include "ctk/ctk.h"
 
 #include "ctk/ctk-vncserver.h"
-#include "ctk/ctk-termtelnet.h"
 
 #include "net/tapdev-drv.h"
 #include "program-handler.h"
@@ -53,7 +52,6 @@
 #include "about-dsc.h"
 #include "calc-dsc.h"
 #include "dhcp-dsc.h"
-#include "editor-dsc.h"
 #include "email-dsc.h"
 #include "ftp-dsc.h"
 #include "irc-dsc.h"
@@ -89,7 +87,6 @@ PROCESS_THREAD(init_process, ev, data)
   
   program_handler_add(&netconf_dsc, "Network setup", 1);
   program_handler_add(&ftp_dsc, "FTP client", 1);
-  program_handler_add(&editor_dsc, "Editor", 1);
   program_handler_add(&www_dsc, "Web browser", 1);
   program_handler_add(&processes_dsc, "Processes", 1);
   program_handler_add(&shell_dsc, "Command shell", 1);
diff --git a/platform/gtk/ctk/ctk-gtksim-service.c b/platform/gtk/ctk/ctk-gtksim-service.c
index 5c070053c..63a300903 100644
--- a/platform/gtk/ctk/ctk-gtksim-service.c
+++ b/platform/gtk/ctk/ctk-gtksim-service.c
@@ -1,5 +1,5 @@
 
-#include "ctk/ctk-draw-service.h"
+/*#include "ctk/ctk-draw-service.h"*/
 
 #include "ctk-gtksim-draw.h"
 #include "ctk-gtksim.h"