From b2ea1da6ba6cd850b4640b339e35bc6aa0e77a6d Mon Sep 17 00:00:00 2001
From: Kris Maglione <kris@suckless.org>
Date: Fri, 28 May 2010 11:05:01 -0400
Subject: [PATCH] Remove stale xcb include line.

---
 alternative_wmiircs/plan9port/wmiirc | 12 +++++++-----
 alternative_wmiircs/python/wmiirc.py |  3 +++
 cmd/tray/selection.c                 |  3 ---
 rc/wmiirc.sh                         |  4 ++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/alternative_wmiircs/plan9port/wmiirc b/alternative_wmiircs/plan9port/wmiirc
index 1724bdfe..4d64faa1 100755
--- a/alternative_wmiircs/plan9port/wmiirc
+++ b/alternative_wmiircs/plan9port/wmiirc
@@ -52,9 +52,11 @@ wmiir write /tagrules <<!
 
 # Status Bar Info
 fn status {
-	echo -n `{uptime | sed 's/.*://; s/,//g'} \
-		'|' `{date}
-}
+	echo -n `{uptime | sed 's/.*://; s/,//g'} '|' \
+		`{date} }
+
+# Generic overridable startup details
+startup() { witray & }
 
 # End Configuration
 
@@ -72,8 +74,7 @@ confpath=`{echo $WMII_CONFPATH | sed 'y/:/ /'}
 # Events
 fn sigexit {
 	rm -f $progs_file
-	wi_cleankeys
-}
+	wi_cleankeys}
 
 fn Event-CreateTag {
 	echo $wmiinormcol $* | wmiir create /lbar/$"*}
@@ -167,6 +168,7 @@ if(~ $0 ('' */)wmiirc_local.rc)
 if not
 	. `{wi_script -f wmiirc_local.rc}
 echo $wmiinormcol | wmiir create $noticebar
+startup
 
 # Key Bindings
 _keys = `{wi_getfuns Key}
diff --git a/alternative_wmiircs/python/wmiirc.py b/alternative_wmiircs/python/wmiirc.py
index 1195c64d..9e678c34 100644
--- a/alternative_wmiircs/python/wmiirc.py
+++ b/alternative_wmiircs/python/wmiirc.py
@@ -47,6 +47,7 @@ setbackground(background)
 
 terminal = 'wmiir', 'setsid', '@TERMINAL@'
 pygmi.shell = os.environ.get('SHELL', 'sh')
+tray = 'witray',
 
 @defmonitor
 def load(self):
@@ -305,4 +306,6 @@ if not os.environ.get('WMII_NOPLUGINS', ''):
         except Exception, e:
             traceback.print_exc(sys.stdout)
 
+call(*tray)
+
 # vim:se sts=4 sw=4 et:
diff --git a/cmd/tray/selection.c b/cmd/tray/selection.c
index 41278d5c..fc0d52d5 100644
--- a/cmd/tray/selection.c
+++ b/cmd/tray/selection.c
@@ -47,9 +47,6 @@ selection_create(char *selection, ulong time,
 	return s;
 }
 
-#include <X11/Xlib-xcb.h>
-#include <xcb/xproto.h>
-
 Selection*
 selection_manage(char *selection, ulong time,
 		 void (*message)(Selection*, XClientMessageEvent*),
diff --git a/rc/wmiirc.sh b/rc/wmiirc.sh
index 4d439c69..2f2a16d8 100644
--- a/rc/wmiirc.sh
+++ b/rc/wmiirc.sh
@@ -58,8 +58,12 @@ status() {
 	echo -n $(uptime | sed 's/.*://; s/,//g') '|' $(date)
 }
 
+# Generic overridable startup details
+startup() { witray & }
+
 local_events() { true;}
 wi_runconf -s wmiirc_local
+startup
 
 echo $WMII_NORMCOLORS | wmiir create $noticebar