Omit the ctk_icon if CTK_CONF_ICONS is 0.
diff --git a/contiki/apps/about-dsc.c b/contiki/apps/about-dsc.c
index 54c496e..c47c921 100644
--- a/contiki/apps/about-dsc.c
+++ b/contiki/apps/about-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: about-dsc.c,v 1.5 2004/06/27 12:34:15 oliverschmidt Exp $
+ * $Id: about-dsc.c,v 1.6 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon about_icon =
{CTK_ICON("About Contiki", abouticon_bitmap, abouticon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/calc-dsc.c b/contiki/apps/calc-dsc.c
index de4167f..aedec22 100644
--- a/contiki/apps/calc-dsc.c
+++ b/contiki/apps/calc-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: calc-dsc.c,v 1.2 2004/06/27 12:34:24 oliverschmidt Exp $
+ * $Id: calc-dsc.c,v 1.3 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon calc_icon =
{CTK_ICON("Calculator", calcicon_bitmap, calcicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/dhcp-dsc.c b/contiki/apps/dhcp-dsc.c
index 7c94569..a9bd423 100644
--- a/contiki/apps/dhcp-dsc.c
+++ b/contiki/apps/dhcp-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: dhcp-dsc.c,v 1.1 2004/09/17 20:42:08 adamdunkels Exp $
+ * $Id: dhcp-dsc.c,v 1.2 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon dhcp_icon =
{CTK_ICON("DHCP client", tcpipconficon_bitmap, tcpipconficon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/editor-dsc.c b/contiki/apps/editor-dsc.c
index fc45bd1..6cf71a3 100644
--- a/contiki/apps/editor-dsc.c
+++ b/contiki/apps/editor-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: editor-dsc.c,v 1.1 2004/08/09 20:08:10 adamdunkels Exp $
+ * $Id: editor-dsc.c,v 1.2 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon icon =
{CTK_ICON("Editor", editoricon_bitmap, editoricon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/email-dsc.c b/contiki/apps/email-dsc.c
index 4ec7113..afb092a 100644
--- a/contiki/apps/email-dsc.c
+++ b/contiki/apps/email-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: email-dsc.c,v 1.3 2004/08/09 20:09:01 adamdunkels Exp $
+ * $Id: email-dsc.c,v 1.4 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon email_icon =
{CTK_ICON("E-mail", tcpipconficon_bitmap, tcpipconficon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/ftp-dsc.c b/contiki/apps/ftp-dsc.c
index f965c69..f29b3b0 100644
--- a/contiki/apps/ftp-dsc.c
+++ b/contiki/apps/ftp-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: ftp-dsc.c,v 1.2 2004/09/09 21:12:10 adamdunkels Exp $
+ * $Id: ftp-dsc.c,v 1.3 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon icon =
{CTK_ICON("FTP client", ftpicon_bitmap, ftpicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/irc-dsc.c b/contiki/apps/irc-dsc.c
index 1429b88..28d653e 100644
--- a/contiki/apps/irc-dsc.c
+++ b/contiki/apps/irc-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: irc-dsc.c,v 1.2 2004/09/09 21:05:56 adamdunkels Exp $
+ * $Id: irc-dsc.c,v 1.3 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon irc_icon =
{CTK_ICON("IRC client", irc_icon_bitmap, irc_icon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/netconf-dsc.c b/contiki/apps/netconf-dsc.c
index c7b7000..b0eb087 100644
--- a/contiki/apps/netconf-dsc.c
+++ b/contiki/apps/netconf-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: netconf-dsc.c,v 1.3 2004/06/27 12:34:24 oliverschmidt Exp $
+ * $Id: netconf-dsc.c,v 1.4 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon netconf_icon =
{CTK_ICON("Network setup", tcpipconficon_bitmap, tcpipconficon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/processes-dsc.c b/contiki/apps/processes-dsc.c
index 1b9ad2f..7315828 100644
--- a/contiki/apps/processes-dsc.c
+++ b/contiki/apps/processes-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: processes-dsc.c,v 1.4 2004/06/27 12:34:24 oliverschmidt Exp $
+ * $Id: processes-dsc.c,v 1.5 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,7 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
-/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICONS
static struct ctk_icon processes_icon =
{CTK_ICON("Processes", processesicon_bitmap, processesicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/shell-dsc.c b/contiki/apps/shell-dsc.c
index 18a4ea1..6996cb0 100644
--- a/contiki/apps/shell-dsc.c
+++ b/contiki/apps/shell-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: shell-dsc.c,v 1.3 2004/07/04 17:46:52 adamdunkels Exp $
+ * $Id: shell-dsc.c,v 1.4 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon shell_icon =
{CTK_ICON("Command shell", shellicon_bitmap, shellicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/telnet-dsc.c b/contiki/apps/telnet-dsc.c
index 61be8fc..54c8452 100644
--- a/contiki/apps/telnet-dsc.c
+++ b/contiki/apps/telnet-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: telnet-dsc.c,v 1.6 2004/12/24 15:17:17 oliverschmidt Exp $
+ * $Id: telnet-dsc.c,v 1.7 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon telnet_icon =
{CTK_ICON("Telnet", telneticon_bitmap, telneticon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/telnetd-dsc.c b/contiki/apps/telnetd-dsc.c
index d6ef38b..9e02a57 100644
--- a/contiki/apps/telnetd-dsc.c
+++ b/contiki/apps/telnetd-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: telnetd-dsc.c,v 1.4 2004/08/20 21:38:11 adamdunkels Exp $
+ * $Id: telnetd-dsc.c,v 1.5 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon telnetd_icon =
{CTK_ICON("Telnet server", telnetdicon_bitmap, telnetdicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/vnc-dsc.c b/contiki/apps/vnc-dsc.c
index 854c081..713a3f3 100644
--- a/contiki/apps/vnc-dsc.c
+++ b/contiki/apps/vnc-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: vnc-dsc.c,v 1.4 2004/09/12 07:33:26 adamdunkels Exp $
+ * $Id: vnc-dsc.c,v 1.5 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon icon =
{CTK_ICON("VNC viewer", vncicon_bitmap, vncicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/webserver-dsc.c b/contiki/apps/webserver-dsc.c
index 93f4f2a..576a6c2 100644
--- a/contiki/apps/webserver-dsc.c
+++ b/contiki/apps/webserver-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: webserver-dsc.c,v 1.2 2004/06/27 12:34:24 oliverschmidt Exp $
+ * $Id: webserver-dsc.c,v 1.3 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon webserver_icon =
{CTK_ICON("Web server", webservericon_bitmap, webservericon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/
diff --git a/contiki/apps/www-dsc.c b/contiki/apps/www-dsc.c
index 66cc77b..19b4143 100644
--- a/contiki/apps/www-dsc.c
+++ b/contiki/apps/www-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: www-dsc.c,v 1.2 2004/06/27 12:34:24 oliverschmidt Exp $
+ * $Id: www-dsc.c,v 1.3 2005/03/18 00:49:42 oliverschmidt Exp $
*
*/
@@ -67,6 +67,8 @@
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
+#if CTK_CONF_ICONS
static struct ctk_icon icon =
{CTK_ICON("Web browser", wwwicon_bitmap, wwwicon_textmap)};
+#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/