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 remove_icon(TrayWindow *traywin);
void draw_systray(void *obj, cairo_t *c, int active);