From 5fa67d5f89f5719d061094ac2aa5f186adf995e3 Mon Sep 17 00:00:00 2001
From: Sascha Kruse <knopwob@googlemail.com>
Date: Mon, 19 Mar 2012 02:26:19 +0100
Subject: [PATCH] removed config.h and config.def.h

The need for them is replaced by dunstrc
---
 Makefile     |  6 +-----
 config.def.h | 40 ----------------------------------------
 dunst.c      | 18 +++++++++++++++++-
 3 files changed, 18 insertions(+), 46 deletions(-)
 delete mode 100644 config.def.h

diff --git a/Makefile b/Makefile
index df6220f..b14b9e8 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,7 @@ options:
 	@echo CC -c $<
 	@${CC} -c $< ${CFLAGS}
 
-${OBJ}: config.h config.mk
-
-config.h:
-	@echo creating $@ from config.def.h
-	@cp config.def.h $@
+${OBJ}: config.mk
 
 dunst: draw.o dunst.o
 	@echo CC -o $@
diff --git a/config.def.h b/config.def.h
deleted file mode 100644
index 91788d8..0000000
--- a/config.def.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "dunst.h"
-
-
-/* appearance */
-const char *font = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
-/*
- * Background and forground colors for messages with
- * low normal and critical urgency.
- */
-char *normbgcolor = "#1793D1";
-char *normfgcolor = "#DDDDDD";
-char *critbgcolor = "#ffaaaa";
-char *critfgcolor = "#000000";
-char *lowbgcolor =  "#aaaaff";
-char *lowfgcolor = "#000000";
-char *format = "%s %b"; /* default format */
-int timeouts[] = { 10, 10, 0 }; /* low, normal, critical */
-char *geom = "0x3-30+20"; /* geometry */
-int sort = True; /* sort messages by urgency */
-int indicate_hidden = True; /* show count of hidden messages */
-/* const char *geom = "x1"; */
-
-
-char *key_string = NULL; /* set to NULL for no keybinging */
-/* char *key_string = "space"; */
-KeySym mask = 0;
-/* KeySym mask = ControlMask; */
-/* KeySym mask = ControlMask || Mod4Mask */
-
-/* 0 -> print nothing
- * 1 -> print messages to stdout
- * 2 -> print everything to stdout (Useful for finding rules
- * 3 -> print everything above + debug info
- */
-int verbosity = 0;
-
-#endif
diff --git a/dunst.c b/dunst.c
index 16e0b15..83bed4b 100644
--- a/dunst.c
+++ b/dunst.c
@@ -16,7 +16,6 @@
 
 #include <iniparser.h>
 
-#include "config.h"
 #include "dunst.h"
 #include "draw.h"
 
@@ -39,6 +38,23 @@ typedef struct _screen_info {
 
 
 /* global variables */
+char *font = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
+char *normbgcolor = "#1793D1";
+char *normfgcolor = "#DDDDDD";
+char *critbgcolor = "#ffaaaa";
+char *critfgcolor = "#000000";
+char *lowbgcolor =  "#aaaaff";
+char *lowfgcolor = "#000000";
+char *format = "%s %b"; /* default format */
+int timeouts[] = { 10, 10, 0 }; /* low, normal, critical */
+char *geom = "0x0"; /* geometry */
+int sort = True; /* sort messages by urgency */
+int indicate_hidden = True; /* show count of hidden messages */
+char *key_string = NULL;
+KeySym mask = 0;
+
+int verbosity = 0;
+
 
 rule_t *rules = NULL;
 /* index of colors fit to urgency level */