commit 0137b44f06cf73dbe99a4edd0f1982a9739ac3f3
author adamdunkels <adamdunkels> mar. avr. 08 23:27:33 2003 +0000
committer adamdunkels <adamdunkels> mar. avr. 08 23:27:33 2003 +0000
tree 09f8181cf325b3ce4c62e9a041ae155350858b92
parent e0cc058b8f81e3ee2e92eaa547bc112adceb5e8f

Made the quit() function have a unique name in each program

contiki/apps/about.c

diff --git a/contiki/apps/about.c b/contiki/apps/about.c
index 70a53b3..4d859ce 100644
--- a/contiki/apps/about.c
+++ b/contiki/apps/about.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: about.c,v 1.1 2003/04/08 17:56:43 adamdunkels Exp $
+ * $Id: about.c,v 1.2 2003/04/08 23:27:33 adamdunkels Exp $
  *
  */
 
@@ -96,7 +96,7 @@
 }
 /*-----------------------------------------------------------------------------------*/
 static void
-quit(void)
+about_quit(void)
 {
   ctk_dialog_close();
   dispatcher_exit(&p);
@@ -110,11 +110,11 @@
 {
   if(s == ctk_signal_button_activate) {
     if(data == (ek_data_t)&aboutclose) {
-      quit();
+      about_quit();
     }
   } else if(s == ctk_signal_hyperlink_activate) {
     if((struct ctk_widget *)data == (struct ctk_widget *)&abouturl) {
-      quit();
+      about_quit();
     }
   }
 }

contiki/apps/email.c

diff --git a/contiki/apps/email.c b/contiki/apps/email.c
index 9ce431b..4ac229b 100644
--- a/contiki/apps/email.c
+++ b/contiki/apps/email.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: email.c,v 1.3 2003/04/08 19:24:55 adamdunkels Exp $
+ * $Id: email.c,v 1.4 2003/04/08 23:27:33 adamdunkels Exp $
  *
  */
 
@@ -150,7 +150,7 @@
 
 /*-----------------------------------------------------------------------------------*/
 static void
-quit(void)
+email_quit(void)
 {
   ctk_window_close(&setupwindow);
   ctk_window_close(&mainwindow);
@@ -375,13 +375,13 @@
       } else if(menu.active == menuitem_setup) {
 	ctk_window_open(&setupwindow);
       } else if(menu.active == menuitem_quit) {
-	quit();
+	email_quit();
       }
       ctk_redraw();
     }
   } else if(s == ctk_signal_window_close &&
 	    data == (ek_data_t)&mainwindow) {
-    quit();
+    email_quit();
   }
 }
 /*-----------------------------------------------------------------------------------*/

contiki/apps/netconf.c

diff --git a/contiki/apps/netconf.c b/contiki/apps/netconf.c
index c9fa40e..e7001c2 100644
--- a/contiki/apps/netconf.c
+++ b/contiki/apps/netconf.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: netconf.c,v 1.1 2003/04/08 17:56:44 adamdunkels Exp $
+ * $Id: netconf.c,v 1.2 2003/04/08 23:27:33 adamdunkels Exp $
  *
  */
 
@@ -167,12 +167,11 @@
 }
 /*-----------------------------------------------------------------------------------*/
 static void
-quit(void)
+netconf_quit(void)
 {
   dispatcher_exit(&p);
   id = EK_ID_NONE;
   LOADER_UNLOAD();
-  ctk_redraw();
 }
 /*-----------------------------------------------------------------------------------*/
 static void
@@ -182,10 +181,11 @@
     if(data == (ek_data_t)&tcpipclosebutton) {
       apply_tcpipconfig();
       ctk_window_close(&tcpipwindow);
-      quit();
+      netconf_quit();
+      ctk_redraw();
     }
   } else if(s == ctk_signal_window_close) {
-    quit();
+    netconf_quit();
   }
 }
 /*-----------------------------------------------------------------------------------*/

contiki/apps/processes.c

diff --git a/contiki/apps/processes.c b/contiki/apps/processes.c
index 92b85c0..0e86d82 100644
--- a/contiki/apps/processes.c
+++ b/contiki/apps/processes.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: processes.c,v 1.1 2003/04/08 17:56:44 adamdunkels Exp $
+ * $Id: processes.c,v 1.2 2003/04/08 23:27:33 adamdunkels Exp $
  *
  */
 
@@ -106,12 +106,11 @@
 }
 /*-----------------------------------------------------------------------------------*/
 static void
-quit(void)
+processes_quit(void)
 {
   dispatcher_exit(&p);
   id = EK_ID_NONE;
   LOADER_UNLOAD();
-  ctk_redraw();
 }
 /*-----------------------------------------------------------------------------------*/
 static void
@@ -124,11 +123,12 @@
       ctk_redraw();
     } else if(data == (ek_data_t)&processclosebutton) {
       ctk_window_close(&processwindow);
-      quit();
+      processes_quit();
+      ctk_redraw();
     }
   } else if(s == ctk_signal_window_close &&
 	    data == (ek_data_t)&processwindow) {
-    quit();
+    processes_quit();
   }
 }
 /*-----------------------------------------------------------------------------------*/