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

diff --git a/player/util.c b/player/util.c
index 5cd1598..70d1ed5 100644
--- a/player/util.c
+++ b/player/util.c
@@ -1,17 +1,50 @@
+/*
+ * 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.
+ */
+
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <config.h>
 #include "util.h"
 #include "error.h"
 
-const char *
+char *
 get_data_file_path(const char *filename)
 {
-	char *path = g_build_filename(PACKAGE_DATA_DIR, filename);
+	char *path = g_build_filename(PACKAGE_DATA_DIR, filename, NULL);
 	if(g_file_test(path, G_FILE_TEST_EXISTS))
 		return path;
 #ifdef DEBUG
 	g_free(path);
-	path = g_build_filename(PACKAGE_SRC_DIR, filename);
+	path = g_build_filename(PACKAGE_SRC_DIR, filename, NULL);
 	if(g_file_test(path, G_FILE_TEST_EXISTS))
 		return path;
 #endif /* DEBUG */