merge autotool bis

[chaz/tint2] / src / systray / systraybar.h

diff --git a/src/systray/systraybar.h b/src/systray/systraybar.h
index fab1891e801540d54fa278d28bdd9d72426a06f9..a405dfd48d50747fda223a3dcdeb26c9caf96abc 100644 (file)
--- a/src/systray/systraybar.h
+++ b/src/systray/systraybar.h
@@ -9,9 +9,7 @@
 #ifndef SYSTRAYBAR_H
 #define SYSTRAYBAR_H
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
+#include "common.h"
 #include "area.h"
 
 
@@ -39,11 +37,16 @@ extern Systraybar systray;
 
 void init_systray();
 void cleanup_systray();
-int net_init();
+
+int init_net();
+void cleanup_net();
 void net_message(XClientMessageEvent *e);
-void icon_remove(TrayWindow *traywin);
 
-void resize_systray (void *obj);
+void remove_icon(TrayWindow *traywin);
+
+void draw_systray(void *obj, cairo_t *c, int active);
+
+void resize_systray(void *obj);
 
 
 #endif