X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fpreferences.c;h=cf485f7c3ca0115a36d57851dbd244ad846fde89;hb=11650f9b922f2b520e12b68c34342ec1fa250f22;hp=b5f2583e2bf3dc6a997a6bc2b3948d06592f244f;hpb=84814759ceb7dc7a97a3a73b6e365a5ca67d4ef8;p=projects%2Fchimara%2Fchimara.git

diff --git a/player/preferences.c b/player/preferences.c
index b5f2583..cf485f7 100644
--- a/player/preferences.c
+++ b/player/preferences.c
@@ -1,26 +1,26 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * callbacks.c
- * Copyright (C) Philip en Marijn 2008 <>
- * 
- * preferences.c is free software copyrighted by Philip en Marijn.
- * 
+ * 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 the name ``Philip en Marijn'' nor the name of any other
- *    contributor may be used to endorse or promote products derived
+ * 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.
- * 
- * preferences.c IS PROVIDED BY Philip en Marijn ``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 Philip en Marijn OR ANY OTHER CONTRIBUTORS
+ *
+ * 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
@@ -30,14 +30,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdlib.h>
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <libchimara/chimara-glk.h>
 #include <libchimara/chimara-if.h>
-#include <config.h>
 #include "error.h"
 #include "app.h"
 #include "preferences.h"
@@ -60,9 +58,6 @@ static void style_tree_select_callback(GtkTreeSelection *selection);
 static void
 chimara_prefs_finalize(GObject *self)
 {
-	//CHIMARA_APP_USE_PRIVATE;
-	//g_object_unref(priv->action_group);
-	
 	/* Chain up */
 	G_OBJECT_CLASS(chimara_prefs_parent_class)->finalize(self);
 }
@@ -72,13 +67,7 @@ chimara_prefs_class_init(ChimaraPrefsClass *klass)
 {
 	/* Override methods of parent classes */
 	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-	//object_class->set_property = chimara_if_set_property;
-	//object_class->get_property = chimara_if_get_property;
 	object_class->finalize = chimara_prefs_finalize;
-	
-	/* Signals */
-
-	/* Properties */
 
 	/* Private data */
 	g_type_class_add_private(klass, sizeof(ChimaraPrefsPrivate));
@@ -177,7 +166,6 @@ interpreter_to_display_string(ChimaraIFInterpreter interp)
 static void
 chimara_prefs_init(ChimaraPrefs *self)
 {
-	GError *error = NULL;
 	ChimaraApp *theapp = chimara_app_get();
 
 	/* Set parent properties */