From: Steven Luo <steven+maemo@steven676.net>
Date: Thu, 17 Dec 2009 12:42:12 +0000 (-0800)
Subject: Merge changes to configfile.h from c-implementation branch
X-Git-Tag: v3.0rc1~7^2~7
X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=commitdiff_plain;h=04f201c15099b479ab6052496eff796c2d643cc4

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
--- 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 */