Merge branch 'master' into next

[i3/i3] / include / manage.h

diff --git a/include/manage.h b/include/manage.h
index 555cefbed4e0d06a7a9a71bdcd02f922e57a51e7..d50f64d49b67efa9a7f538025edd2f5c09b1100e 100644 (file)
--- a/include/manage.h
+++ b/include/manage.h
@@ -1,20 +1,17 @@
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * manage.c: Initially managing new windows (or existing ones on restart).
  *
  */
-#include <xcb/xcb.h>
+#ifndef I3_MANAGE_H
+#define I3_MANAGE_H
 
 #include "data.h"
 
-#ifndef _MANAGE_H
-#define _MANAGE_H
-
 /**
  * Go through all existing windows (if the window manager is restarted) and
  * manage them
@@ -30,7 +27,7 @@ void manage_existing_windows(xcb_window_t root);
  * side-effects which are to be expected when continuing to run i3.
  *
  */
-void restore_geometry();
+void restore_geometry(void);
 
 /**
  * Do some sanity checks and then reparent the window.