mac build compiles again

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 4bd9f149f55dffc7f940c2227cce9a39735c8823..ae72920d3804b91e96dcc7ac7db0b0ea15b6eae9 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -195,7 +195,8 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
     {
         fDefaults = [NSUserDefaults standardUserDefaults];
         
-        fLib = tr_initFull("macosx",
+        fLib = tr_initFull(NULL, /* use default config directory (Application Support) */
+                        "macosx",
                         [fDefaults boolForKey: @"PEXGlobal"],
                         [fDefaults boolForKey: @"NatTraversal"],
                         [fDefaults integerForKey: @"BindPort"],

diff --git a/macosx/IPCController.m b/macosx/IPCController.m
index c84265b0f23fa840840a5b8ede89b4d797c96276..0cdbec8cc1a6efd9be8faa1fb234ec2273bbbfc6 100644 (file)
--- a/macosx/IPCController.m
+++ b/macosx/IPCController.m
@@ -514,7 +514,7 @@ void getaddr( struct sockaddr_un * sun )
 {
     bzero( sun, sizeof *sun );
     sun->sun_family = AF_LOCAL;
-    strlcpy( sun->sun_path, tr_getPrefsDirectory(), sizeof sun->sun_path );
+    strlcpy( sun->sun_path, tr_getDefaultConfigDir(), sizeof sun->sun_path );
     strlcat( sun->sun_path, "/socket", sizeof sun->sun_path );
 }