From 82dc5e1f715acf4bcaef75cb5e54542082a173a3 Mon Sep 17 00:00:00 2001
From: jacob1 <jfu614@gmail.com>
Date: Sun, 24 Jan 2016 15:44:13 -0500
Subject: [PATCH] don't save powder.pref in a .plist file on OS X

untested, but it didn't make sense how we were doing it anyway. Also, it was spelled wrong
---
 src/SDLMain.m         | 28 ----------------------------
 src/client/Client.cpp | 26 +-------------------------
 2 files changed, 1 insertion(+), 53 deletions(-)

diff --git a/src/SDLMain.m b/src/SDLMain.m
index 63bb32837e..511f7d2879 100644
--- a/src/SDLMain.m
+++ b/src/SDLMain.m
@@ -367,34 +367,6 @@ - (NSString *)stringByReplacingRange:(NSRange)aRange with:(NSString *)aString
 
 @end
 
-char * readUserPreferences()
-{
-    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
-
-    NSString *prefDataNSString = [prefs stringForKey:@"powder.pref"];
-    const char *prefData = [prefDataNSString UTF8String];
-    if(prefData == NULL)
-        prefData = "";
-
-    char *prefDataCopy = calloc([prefDataNSString length]+1, 1);
-    SDL_strlcpy(prefDataCopy, prefData, [prefDataNSString length]+1);
-
-    [prefDataNSString release];
-
-    return prefDataCopy;
-}
-
-void writeUserPreferences(const char * prefData)
-{
-    NSString *prefDataNSString = [NSString stringWithUTF8String:prefData];
-
-    NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
-    [prefs setObject:prefDataNSString forKey:@"powder.pref"];
-    [prefs synchronize];
-
-    [prefDataNSString release];
-}
-
 //doesn't work on OS X 10.5 or below
 char * readClipboard()
 {
diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index e26c9bef34..22c8dc9218 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -60,10 +60,6 @@ extern "C"
 #else
 #include <dirent.h>
 #endif
-#ifdef MACOSX
-char * readUserPreferences();
-void writeUserPreferences(const char * prefData);
-#endif
 }
 
 
@@ -88,15 +84,9 @@ Client::Client():
 	}
 
 	//Read config
-#ifdef MACOSX
-	char * prefData = readUserPreferences();
-	std::stringstream configFile(prefData);
-	free(prefData);
-#else
 	std::ifstream configFile;
 	configFile.open("powder.pref", std::ios::binary);
-#endif
-	if(configFile)
+	if (configFile)
 	{
 		int fsize = configFile.tellg();
 		configFile.seekg(0, std::ios::end);
@@ -126,9 +116,7 @@ Client::Client():
 				std::cerr << "Error: Could not read data from prefs: " << e.what() << std::endl;
 			}
 		}
-#ifndef MACOSX
 		configFile.close();
-#endif
 		firstRun = false;
 	}
 	else
@@ -930,12 +918,8 @@ void Client::RemoveListener(ClientListener * listener)
 
 void Client::WritePrefs()
 {
-#ifdef MACOSX
-	std::stringstream configFile;
-#else
 	std::ofstream configFile;
 	configFile.open("powder.pref", std::ios::trunc);
-#endif
 	
 	if (configFile)
 	{
@@ -958,15 +942,7 @@ void Client::WritePrefs()
 		}
 		json::Writer::Write(configDocument, configFile);
 
-#ifdef MACOSX
-		std::string prefString = configFile.str();
-
-		char prefData[prefString.length()+1];
-		std::strcpy(prefData, prefString.c_str());
-		writeUserPreferences(prefData);
-#else
 		configFile.close();
-#endif
 	}
 }