X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=configfile.h;h=b2aec5da114385469b36233f89d6bf6c746fc443;hp=c655274d5af8383a27c2796966e4fa0c51353c04;hb=5b0b21af1f236d7601261a493ab0bc413b49f2bf;hpb=9f08a817761251fa1c0070e3c03558ddfda5a162

diff --git a/configfile.h b/configfile.h
index c655274..b2aec5d 100644
--- a/configfile.h
+++ b/configfile.h
@@ -24,28 +24,13 @@
 #define _CONFIGFILE_H
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <regex.h>
 
 #define DEFAULT_HOMEDIR "/home/user"
-#define CONFIGFILE_LOC "/.config/browser-switchboard"
-#define CONFIGFILE_LOC_OLD "/.config/browser-proxy"
-#define MAXLINE 1024
-
-/* regex matching blank lines or comments */
-#define REGEX_IGNORE "^[[:space:]]*(#|$)"
-#define REGEX_IGNORE_FLAGS REG_EXTENDED|REG_NOSUB
-
-/* regex matching foo = "bar", with arbitrary whitespace at beginning and end
-   of line and surrounding the = */
-#define REGEX_CONFIG1 "^[[:space:]]*([^=[:space:]]+)[[:space:]]*=[[:space:]]*\"(.*)\"[[:space:]]*$"
-#define REGEX_CONFIG1_FLAGS REG_EXTENDED
-
-/* regex matching foo = bar, with arbitrary whitespace at beginning of line and
-   surrounding the = */
-#define REGEX_CONFIG2 "^[[:space:]]*([^=[:space:]]+)[[:space:]]*=[[:space:]]*(.*)$"
-#define REGEX_CONFIG2_FLAGS REG_EXTENDED|REG_NEWLINE
-
+#define CONFIGFILE_DIR "/.config/"
+#define CONFIGFILE_NAME "browser-switchboard"
+#define CONFIGFILE_NAME_OLD "browser-proxy"
+#define CONFIGFILE_LOC CONFIGFILE_DIR CONFIGFILE_NAME
+#define CONFIGFILE_LOC_OLD CONFIGFILE_DIR CONFIGFILE_NAME_OLD
 
 struct swb_config_line {
 	/* Whether or not the line has been parsed */