Moving folder for storing config on MacOS to user.home/Library......

1 files changed, 26 insertions, 0 deletions

diff --git a/src/net/java/sip/communicator/launcher/SIPCommunicator.java b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
index fe381ab..3dc2f71 100644
--- a/src/net/java/sip/communicator/launcher/SIPCommunicator.java
+++ b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
@@ -7,6 +7,7 @@
 package net.java.sip.communicator.launcher;
 
 import java.awt.*;
+import java.io.*;
 
 import org.apache.felix.main.*;
 
@@ -29,6 +30,31 @@ public class SIPCommunicator
         String vmVendor = System.getProperty("java.vendor");
         String osName = System.getProperty("os.name");
 
+        /**
+         * Check whether default config folder exists.
+         * If it exists we use it. Otherwise use the settings coming 
+         * from system properties. 
+         * This is done cause moving the config folder and preventing
+         * not using existing data for users already using default folder. 
+         */
+        if (osName.startsWith("Mac"))
+        {
+            String scDefultDirName = ".sip-communicator";
+            
+            String defaultAppDirName = 
+                System.getProperty("user.home") + 
+                File.separator + 
+                scDefultDirName;
+
+            if(new File(defaultAppDirName).exists())
+            {
+                System.setProperty("net.java.sip.communicator.SC_HOME_DIR_LOCATION", 
+                        System.getProperty("user.home"));
+                System.setProperty("net.java.sip.communicator.SC_HOME_DIR_NAME", 
+                        scDefultDirName);
+            }
+        }
+        
         if (version.startsWith("1.4") || vmVendor.startsWith("Gnu"))
         {
             String os = "";