From de93f721c1314321bf78acec2f50d5a481210ec9 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Tue, 18 Jan 2011 12:59:49 +0000
Subject: [PATCH] Clean up the copyright and licensing blurbs
---
clutter/glx/clutter-stage-glx.c | 9 ++++----
clutter/x11/clutter-device-manager-core-x11.c | 2 +-
clutter/x11/clutter-device-manager-core-x11.h | 2 +-
clutter/x11/clutter-device-manager-xi2.c | 2 +-
clutter/x11/clutter-device-manager-xi2.h | 2 +-
clutter/x11/clutter-input-device-core-x11.c | 23 +++++++++++++++++++
6 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/clutter/glx/clutter-stage-glx.c b/clutter/glx/clutter-stage-glx.c
index e0954b2e9..f3dc2cb3f 100644
--- a/clutter/glx/clutter-stage-glx.c
+++ b/clutter/glx/clutter-stage-glx.c
@@ -119,7 +119,8 @@ clutter_stage_glx_realize (ClutterStageWindow *stage_window)
/* Try and create a GLXWindow to use with extensions dependent on
* GLX versions >= 1.3 that don't accept regular X Windows as GLX
- * drawables. */
+ * drawables.
+ */
if (glXQueryVersion (backend_x11->xdpy, &major, &minor) &&
major == 1 && minor >= 3 &&
_clutter_backend_glx_get_fbconfig (backend_glx, &config))
@@ -138,9 +139,9 @@ clutter_stage_glx_realize (ClutterStageWindow *stage_window)
? stage_glx->glxwin
: stage_x11->xwin;
- /* similarly to above, we unconditionally select this event
- * because we rely on it to advance the master clock, and
- * drive redraw/relayout, animations and event handling.
+ /* we unconditionally select this event because we rely on it to
+ * advance the master clock, and drive redraw/relayout, animations
+ * and event handling.
*/
glXSelectEvent (backend_x11->xdpy,
drawable,
diff --git a/clutter/x11/clutter-device-manager-core-x11.c b/clutter/x11/clutter-device-manager-core-x11.c
index 8d005c63f..a13d89480 100644
--- a/clutter/x11/clutter-device-manager-core-x11.c
+++ b/clutter/x11/clutter-device-manager-core-x11.c
@@ -3,7 +3,7 @@
*
* An OpenGL based 'interactive canvas' library.
*
- * Copyright (C) 2009 Intel Corp.
+ * Copyright © 2009, 2010, 2011 Intel Corp.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/clutter/x11/clutter-device-manager-core-x11.h b/clutter/x11/clutter-device-manager-core-x11.h
index 8d659679f..945d470fc 100644
--- a/clutter/x11/clutter-device-manager-core-x11.h
+++ b/clutter/x11/clutter-device-manager-core-x11.h
@@ -3,7 +3,7 @@
*
* An OpenGL based 'interactive canvas' library.
*
- * Copyright (C) 2009 Intel Corp.
+ * Copyright © 2009, 2010, 2011 Intel Corp.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c
index 7ffe3c391..9063cd880 100644
--- a/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/x11/clutter-device-manager-xi2.c
@@ -3,7 +3,7 @@
*
* An OpenGL based 'interactive canvas' library.
*
- * Copyright (C) 2009 Intel Corp.
+ * Copyright © 2011 Intel Corp.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/clutter/x11/clutter-device-manager-xi2.h b/clutter/x11/clutter-device-manager-xi2.h
index f516fccf0..ec54cbdb4 100644
--- a/clutter/x11/clutter-device-manager-xi2.h
+++ b/clutter/x11/clutter-device-manager-xi2.h
@@ -3,7 +3,7 @@
*
* An OpenGL based 'interactive canvas' library.
*
- * Copyright (C) 2009 Intel Corp.
+ * Copyright © 2011 Intel Corp.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/clutter/x11/clutter-input-device-core-x11.c b/clutter/x11/clutter-input-device-core-x11.c
index 5d729e992..573300c0c 100644
--- a/clutter/x11/clutter-input-device-core-x11.c
+++ b/clutter/x11/clutter-input-device-core-x11.c
@@ -1,3 +1,26 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright © 2010, 2011 Intel Corp.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Emmanuele Bassi <ebassi@linux.intel.com>
+ */
+
#include "config.h"
#include "clutter-input-device-core-x11.h"