Changeset 286

Timestamp:

08/22/10 10:01:19 (18 months ago)

Author:

mickem

Message:

some more monir twekas

Location:

trunk/include

Files:

• config.h.in (modified) (1 diff)
• settings/settings_ini.hpp (modified) (1 diff)

trunk/include/config.h.in

@@ -74 +74 @@
 
 
+#ifdef WIN32
+#define DEFAULT_CONF_LOCATION _T("old")
+#else
 #define DEFAULT_CONF_LOCATION _T("ini")
+#endif
 #define DEFAULT_CONF_OLD_LOCATION _T("old://${exe-path}/nsc.ini")
-
-/*
-#;location=old://${exe-path}/nsc.ini
-#location=ini://${exe-path}/nsclient.ini
-#;location=ini://${base-path}/nsclient.ini
-#;location=registry://HKEY_LOCAL_MACHINE/software/NSClient++
-*/
-
+#define DEFAULT_CONF_INI_LOCATION _T("ini://${shared-path}/nsclient.ini")
+#define DEFAULT_CONF_REG_LOCATION _T("registry://HKEY_LOCAL_MACHINE/software/NSClient++")
 
 

trunk/include/settings/settings_ini.hpp

@@ -226 +226 @@
       }
       std::wstring f = get_file_name().string();
-      get_core()->get_logger()->debug(__FILEW__, __LINE__, _T("Loading: ") + f);
+      get_core()->get_logger()->debug(__FILEW__, __LINE__, _T("Loading: ") + f + _T(" from ") + get_context());
       SI_Error rc = ini.LoadFile(f.c_str());
       if (rc < 0)