From 1aed0427f92336a28ec8449d94d76c3045a69b32 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Sat, 5 Mar 2016 20:16:10 +0100
Subject: [PATCH] Remove hack with config file.

---
 Makefile.am                       | 11 +----------
 config/{config.def.c => config.c} |  0
 test/textbox-test.c               |  6 ++++--
 3 files changed, 5 insertions(+), 12 deletions(-)
 rename config/{config.def.c => config.c} (100%)

diff --git a/Makefile.am b/Makefile.am
index a98704e0..bb5d33ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,14 +112,6 @@ markdown_FILES=\
 
 README.html: README.md
 	$(md_verbose) markdown $< > $@
-
-
-##
-# config directory
-##
-$(top_builddir)/config/config.c: $(top_srcdir)/config/config.def.c
-	cp $(top_srcdir)/config/config.def.c $@
-
 ##
 # Extra DIST
 ##
@@ -127,7 +119,6 @@ EXTRA_DIST=\
 	$(markdown_FILES)\
 	$(markdown_SC_FILES)\
 	Examples/i3_switch_workspaces.sh\
-	$(top_srcdir)/config/config.def.c\
 	INSTALL.md\
 	AUTHORS\
 	doc/rofi.doxy.in\
@@ -298,7 +289,7 @@ test-x1: $(bin_PROGRAMS)
 
 
 .PHONY: indent
-indent: $(rofi_SOURCES) $(top_srcdir)/config/config.def.c $(helper_test_SOURCES) $(textbox_test_SOURCES) $(rofi_test_SOURCES)
+indent: $(rofi_SOURCES) $(helper_test_SOURCES) $(textbox_test_SOURCES) $(rofi_test_SOURCES)
 	uncrustify -c $(top_srcdir)/data/uncrustify.cfg --replace $^
 
 .PHONY: cppcheck
diff --git a/config/config.def.c b/config/config.c
similarity index 100%
rename from config/config.def.c
rename to config/config.c
diff --git a/test/textbox-test.c b/test/textbox-test.c
index 2988dac4..a7093d70 100644
--- a/test/textbox-test.c
+++ b/test/textbox-test.c
@@ -24,8 +24,10 @@ unsigned int normal_window_mode = 0;
 void rofi_view_queue_redraw ()
 {
 }
-Color color_get ( const char *name )
+Color color_get ( G_GNUC_UNUSED const char *name )
 {
+    Color retv = { 1.0, 1.0, 1.0, 1.0 };
+    return retv;
 }
 
 int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup )
@@ -34,7 +36,7 @@ int rofi_view_error_dialog ( const char *msg, G_GNUC_UNUSED int markup )
     return FALSE;
 }
 
-int abe_test_action ( KeyBindingAction action, unsigned int mask, xkb_keysym_t key )
+int abe_test_action ( G_GNUC_UNUSED KeyBindingAction action, G_GNUC_UNUSED unsigned int mask, G_GNUC_UNUSED xkb_keysym_t key )
 {
     return FALSE;
 }