From 178cd0174b315e2fef4338f3c2d8af4fbadf7476 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Wed, 28 May 2008 15:31:32 +0000
Subject: [PATCH] Setting the right home folder when starting.

---
 lib/sc-launcher.jar                           | Bin 8971 -> 9011 bytes
 resources/install/build.xml                   |   4 +---
 .../launcher/SIPCommunicator.java             |   9 ++++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/sc-launcher.jar b/lib/sc-launcher.jar
index 7b6d0ca4668b4e6bc0b2bba66b75f97377813b3a..6c32e407737e2b9272ff52836a7573280f266476 100644
GIT binary patch
delta 1077
zcmV-51j_r1Mzcn+7aJ4slDs&LfIBwQ0{{Tj1^@s!02Pzb0VI=78ybJ~cs)q;cs)o}
zcmx3U0RRA%RBd+?RS<rbX1kkok@gm<;YAB7hSFpyqGCX_q%935O(nIVMXlT9Cb?y^
zyX<b-6kq=a{sBJ2;iNrsjz7R3<#BG(msIkh=A6u(`|Qk}ndi>jzyJC3F96r@dkj}F
zrQ>=GALE9OPjq~$<FkJlZsKztX$`kxh)RRoa{VHTQ@A6wFExA>qs_DwcXec>|BQ}V
z9dkPF>6q7%)p1|P*E(`K@){OmxFGEdSd`+MC?23Fu_dW}E45`QN>V(GVFjxi9%=Ya
z!QgG-i13brfy9+%1(A$f;j}a?;V2kOJj!iYo0e%?PR%TazHonPx1?EYwpHd{C|oDd
z@V$WvTvcF5)6^#S1Hv`@U|<bDDj3>>or>!#(A*&9SPhCXkhjVjECcH(D;P-y!b_Ij
zMx*J7vK30(vH!-t+pJbOeTX&#?x*T*gBz%TL=`myb%?zrOyQby!saru4Fiv1D@Zv!
zOm$MBK&jq9sbYU-ZN8A7U7N{1Sj!bM(@WXHf`JBzfr;aJEllTUskWS0_bq>0!RWN-
z+0u@f7%w(G&-Fv9cq(;+<UOaU07N|zP$)iBpyq_rY>|IS5J_8sf+-4Xb}FH;W^Y)c
zqv@3E+&43IB8J~z&d>S8rv}%6hbIPn(4B+^n%Fe3g_eJTZK*w#+E4h|z%Te!!*2$X
zNGZ5}j7Y`oV&=%j3?E)hVSR&_skYHW=%6=_7#6pKkT<9uYCK%@U61=A5p_Ayr@`KY
zj-J%Ps0oA6^24Ac!n%Sp{SI0sk}c1p)>ANftVrDsqj=GPdzRlVm-S0X58eGlPAB@N
z+&3i}o<V=!5<wVrMvgKZ3VI2-*~jUBQDkj}=925$j|JVz2$4O*t5(wv53qx5do0QO
zB$*b=KIcwRJmqrsd(37;gFAAp$&kH?QVVa1io6CTOU%$orS6t0Bw(=4MXgSuqx5Bd
zPnTuq-0p~we<GXhJS>DRi$JW~@)b&~O6;ub*GzxQv#1x%Dz`<;l&_PSCxMGd&?_r{
zCupMR86r7JyAfJx$e>Q_KzY$Ih{}d1Gy1Gtf{H;}$JmKo4CGjZWS*%c7m{qS4ec4W
znVyckMs#HdF*ZbB+Av<?B*}P$L>q6V)z>(+5?6OH+{VZ=#2M=t?qamWPRAp1eU2%{
z`krXQ&K#;^-2<h=RrWT8{{zM(d#97f6BbWL_LGXSv+2llj3?Q-z5O}4A5OCKoxR4+
z%cL)?#3MU+H?790r1#nwe}#*x9ar19q}r8z=>0DA0YPni7+0yR%P%H&@llsAll~DR
v@fz@x&>tVOKp##64e*k@IE{ciHqrwC0MwJ4B2ohMc$4oU76wWm00000TWSod

delta 1055
zcmV+)1mOF#MvF$U7aJ3$fV?<2nbfMP0{{Sh1^@s!02Pzb0VI=78ybIwSUpIESUpHp
zcmx3U0RRA%RPA!xL=-)0EK62Yny76+DIYB##Z6<WDFupK3aOJcE_NL15R()LioLcs
zl_gh_6Q}SZ<puh?4C7?z3=hD2@Bq93!(BN^9qJ#!GrqffboSnJ@7~=%|M~q70N3!d
zh7Vz@xTawS*HwI^;)Z{Uk2QRPPgUGh@R^2`AY{dOD}^(-EoPr9xTDeH3t_%gF)Q}p
zRgqIMr(#~kf{J@87FFaG+}ChHFuy`Um|_Y`C<$y?%)S=02f~zvS<&zfRuxnfd@CV&
zn|nOEBVi<cWmQ5V=hqkwEr)v&CejZJTh6v)yN=he%Td6+#w~wA)8@NX){eOEg$mYm
zq;W-pE~wTv3qrybtm}A)?<9;Kz+TM{Bq)Apc}|OBj1--!g70<wfDH-bR><3#s^4mL
zJYIDo!JYVT?7N+MozaI>CuD)u^jl2Fk8pHsqN<|?b|Av$zP-R*CWO^>G|-e_c`UMG
zDHO;W3}lsa8;gIX;{3*3{=r6}l$%}2mzH#JY)P0p*{-G8;yh(EW8ENo&+AA4m6j4L
zm8r&ZfqR`U<zC@bgq={r47s&qrR3HgbW7=WylRsLcCJZ@v-_*Xg@Ed%;E@g&Egc?w
z1#KOV5$FgJ>F9{rwwUdpt78{W6#S&)DyAh|KS88&emQ@4tngzm3t!sYV%12(*_Y7K
z*&id8cf*La=(rm!S`Pd+3!+^Km(xQU=vC;rrx>Fq3nM3p!U~V*_|6Y=v`$5K+HGnr
z3DYNv)bAjQmkL?i3Hs?8!vv|3e<<W!dZ^@~lIU_IS(k@V7+)z;I2sNX<mQk~|EomK
zPGqn6zWaZO)2WP8vFBLb>A2AmcBFQINxM%IwOkDt^UC}Q6L))nHpg4c6W5lA#;Yi`
z@D8tuW03Mx8S+%=FDXL;l1;`NO$wc&FN+6rk#@nShU)K6=kxKyLFg(E`KBvgne@8A
zCjFpcJ8g%0(XKO>cWv?d*hMn9gv<1Pir*=^QS^Vzke#B{IE{44AW!W<dL9!}qTz`q
zKK~6FNgDq$PVHl)U?j*E4Vmmx#z^*{JjJ4+W)m-vTHAwWjMA4L^j~qBteGIw!)saj
z1<tIQ@*c)|7=MZh!-$FdI9oB!nF%poHO`Z_U!YGL6S3RJ#_QR{VGPZ9Bb#`Jiy6Z_
zSerp&J(e*h<F#T;3Jn+5%)}nv%*rMye5;4If5SVnYsx)bl-=4Pbg2)$OHdE*nKG$-
z|M}EDKIo^Pp?`vEVgdgGlQ1A0vt}Pq0}Z8syf`<R)T*ij004cH!y-~1g;+gERd@gZ
ZP)h{{000003;+xO(*pniA|C(%000|{@+ANO

diff --git a/resources/install/build.xml b/resources/install/build.xml
index 37e14a926..1c5e58eba 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -354,7 +354,7 @@
             value="org.osgi.framework.system.packages= com.growl;"/>
       <replaceregexp file="${macosx.resrc.dir}/felix.client.run.properties"
                 match="^felix.cache.profiledir=\$\{user.home\}/.sip-communicator/sip-communicator.bin"
-                replace="felix.cache.profiledir=${user.home}/Library/Application Support/${application.name}/sip-communicator.bin"
+                replace="felix.cache.profiledir=$\{user.home\}/Library/Application Support/${application.name}/sip-communicator.bin"
                 flags="m"/>
       <echo file="${macosx.resrc.dir}/felix.client.run.properties"
             append="true">felix.auto.start.70= reference:file:sc-bundles/growlnotification.jar
@@ -402,8 +402,6 @@
         <javaproperty name="java.library.path"
                       value="$JAVAROOT/lib/native/mac:${system.DYLD_LIBRARY_PATH}"/>
 
-        <javaproperty name="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
-                      value="${user.home}/Library/Application Support"/>
         <javaproperty name="net.java.sip.communicator.SC_HOME_DIR_NAME"
                       value="${application.name}"/>
 
diff --git a/src/net/java/sip/communicator/launcher/SIPCommunicator.java b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
index 3dc2f7112..25115125e 100644
--- a/src/net/java/sip/communicator/launcher/SIPCommunicator.java
+++ b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
@@ -33,7 +33,8 @@ public static void main(String[] args)
         /**
          * Check whether default config folder exists.
          * If it exists we use it. Otherwise use the settings coming 
-         * from system properties. 
+         * from system properties. And set SC_HOME_DIR_LOCATION 
+         * as we cannot set it when building dmg packet.
          * This is done cause moving the config folder and preventing
          * not using existing data for users already using default folder. 
          */
@@ -53,6 +54,12 @@ public static void main(String[] args)
                 System.setProperty("net.java.sip.communicator.SC_HOME_DIR_NAME", 
                         scDefultDirName);
             }
+            else
+            {
+                System.setProperty("net.java.sip.communicator.SC_HOME_DIR_LOCATION", 
+                        System.getProperty("user.home") + File.separator +
+                        "Library" + File.separator + "Application Support");
+            }
         }
         
         if (version.startsWith("1.4") || vmVendor.startsWith("Gnu"))