Ticket #868: atlas-xdg-2012-01-15.patch

0ad/source/tools/atlas/AtlasUI/Misc/DLLInterface.h

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 20 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -19 +19 @@
 #define DLLINTERFACE_INCLUDED
 
 #include <wchar.h>
+
 
 namespace AtlasMessage { class MessagePasser; }
 

0ad/source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp

@@ -1 @@
-/* Copyright (C) 2009 Wildfire Games.
+/* Copyright (C) 20 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -187 +187 @@
         if (! wxIsDebuggerRunning())
             wxHandleFatalExceptions();
 #endif
-
+#if OS_UNIX && !OS_MACOSX
+        // This should actually be fixed in the wxWidgets file
+        // src/unix/stdpaths.cpp but since we're allowing for
+        // external wxWidgets and are not even supplying our own
+        // version we need to fix this here.
+        // Ensure we are in / (NOTE: ugly hack (see above))
+        wxString configPath = wxT("/../../../../../../../../../../..");
+        configPath += wxGetenv(wxT("XDG_CONFIG_HOME"))?wxGetenv(wxT("XDG_CONFIG_HOME")):wxFileName::GetHomeDir() + wxT("/.config");
+        // 0ad specific config dir
+        configPath += wxT("/0ad/config/");
+        
+        // Initialise the global config file (XDG compatibility hack)
+        wxConfigBase::Set(new wxConfig(configPath + wxT("atlas.ini"), _T("Wildfire Games")));
+#else
         // Initialise the global config file
         wxConfigBase::Set(new wxConfig(_T("Atlas Editor"), _T("Wildfire Games")));
+
 
         if (! g_HasSetDataDirectory)
         {