Merge changes to configfile.h from c-implementation branch

Need CONFIGFILE_DIR from this change.

diff --git a/configfile.h b/configfile.h
index b8be9e6..b2aec5d 100644 (file)
--- a/configfile.h
+++ b/configfile.h
@@ -26,8 +26,11 @@
 #include <stdio.h>
 
 #define DEFAULT_HOMEDIR "/home/user"
-#define CONFIGFILE_LOC "/.config/browser-switchboard"
-#define CONFIGFILE_LOC_OLD "/.config/browser-proxy"
+#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 */