General code cleanup

[projects/chimara/chimara.git] / player / preferences.h

diff --git a/player/preferences.h b/player/preferences.h
index 144a98599373b1bd6ddec693e00d08aa94fdd73b..243de18ec9072c325e4161df7a8e77fcbeab4a28 100644 (file)
--- a/player/preferences.h
+++ b/player/preferences.h
@@ -1,9 +1,39 @@
-#ifndef PREFERENCES_H
-#define PREFERENCES_H
+/*
+ * Copyright (C) 2008, 2009, 2010, 2011 Philip Chimento and Marijn van Vliet.
+ * All rights reserved.
+ *
+ * Chimara is free software copyrighted by Philip Chimento and Marijn van Vliet.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither of the names Philip Chimento or Marijn van Vliet, nor the name of
+ *    any other contributor may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __PREFERENCES_H__
+#define __PREFERENCES_H__
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include "app.h"
 
 G_BEGIN_DECLS
 
@@ -26,8 +56,7 @@ typedef struct _ChimaraPrefsClass {
 
 GType chimara_prefs_get_type(void) G_GNUC_CONST;
 GtkWidget *chimara_prefs_new(void);
-G_GNUC_INTERNAL void preferences_create(ChimaraApp *theapp, GtkBuilder *builder);
 
 G_END_DECLS
 
-#endif
+#endif /* __PREFERENCES_H__ */