From 687b648c1b7059eca0b30fcb4cf768bf49106945 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Fri, 14 Dec 2007 16:15:40 +0100
Subject: [PATCH] fix some includes and add copyright

---
 client.c |  1 +
 layout.c |  1 +
 uicb.c   |  1 +
 xutil.c  | 23 +++++++++++++++++++++++
 xutil.h  |  5 ++---
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/client.c b/client.c
index 3daa4578e..fde36f40e 100644
--- a/client.c
+++ b/client.c
@@ -28,6 +28,7 @@
 #include "layout.h"
 #include "tag.h"
 #include "rules.h"
+#include "util.h"
 #include "xutil.h"
 #include "statusbar.h"
 #include "window.h"
diff --git a/layout.c b/layout.c
index 23fbcfe61..1533d10d6 100644
--- a/layout.c
+++ b/layout.c
@@ -25,6 +25,7 @@
 #include "screen.h"
 #include "layout.h"
 #include "tag.h"
+#include "util.h"
 #include "xutil.h"
 #include "statusbar.h"
 #include "layouts/floating.h"
diff --git a/uicb.c b/uicb.c
index 8d5adda3e..31c0feb3a 100644
--- a/uicb.c
+++ b/uicb.c
@@ -20,6 +20,7 @@
  */
 
 #include "awesome.h"
+#include "util.h"
 #include "xutil.h"
 #include "uicb.h"
 #include "screen.h"
diff --git a/xutil.c b/xutil.c
index aea58016b..ee883273e 100644
--- a/xutil.c
+++ b/xutil.c
@@ -1,8 +1,30 @@
+/*
+ * xutil.c - X-related useful functions
+ *
+ * Copyright © 2007 Julien Danjou <julien@danjou.info>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/Xinerama.h>
 #include <sys/wait.h>
 
+#include "util.h"
 #include "xutil.h"
 
 void
@@ -92,3 +114,4 @@ xgettextprop(Display *disp, Window w, Atom atom, char *text, ssize_t textlen)
     return True;
 }
 
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/xutil.h b/xutil.h
index d3fef3117..780d39171 100644
--- a/xutil.h
+++ b/xutil.h
@@ -1,8 +1,7 @@
 /*
- * xutil.c - X-related useful functions header
+ * xutil.h - X-related useful functions header
  *
  * Copyright © 2007 Julien Danjou <julien@danjou.info>
- * Copyright © 2006 Pierre Habouzit <madcoder@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +22,7 @@
 #ifndef AWESOME_XUTIL_H
 #define AWESOME_XUTIL_H
 
-#include "util.h"
+#include "common.h"
 
 Bool xgettextprop(Display *, Window, Atom, char *, ssize_t);
 UICB_PROTO(uicb_spawn);