From 04b95ac30f5fe2a19cdb7502844e7757dda2dfb9 Mon Sep 17 00:00:00 2001
From: Romain Kuntz <rkuntz@java.net>
Date: Sat, 12 Apr 2008 16:11:47 +0000
Subject: [PATCH] Updated the sparkle dynamic library and the SparkleActivator.
 SparkleActivator can now gives the path to the Sparkle framework to the JNI.

---
 lib/native/mac/libsparkle_init.dylib          | Bin 17244 -> 17240 bytes
 ...mmunicator_impl_sparkle_SparkleActivator.h |   4 ++--
 ...mmunicator_impl_sparkle_SparkleActivator.m |  15 ++++++++-------
 .../impl/sparkle/SparkleActivator.java        |   5 +++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/native/mac/libsparkle_init.dylib b/lib/native/mac/libsparkle_init.dylib
index fe8eb0cba7d400868872adda6360d9f8b8285b2f..5658985ec60ca0b7c7786c5f33623ac30ccc7f8d 100755
GIT binary patch
delta 1030
zcmZ8gZ%7ki7=KT%Ip^G+Xs0b(n;iv`p`cMz#MH~eY5!abMqw#tEX7(;A7aL#bR7rU
zOZKfGgzTF&DL)u&Woa~Ugwdjf78VCB@IypkV9)#BC9Q+s-aYT{_xzsceeT}m0FxMC
z27}pdJ3_-52)T!@?#iBUAXLX7H1RN6pUJe~T(;hmn(rOC(|YNYGw@)={dMPC(4r!M
z-HT8TS@9Kii)S1nNJNw7x&&($#A9YWh@<R!rZW7I-J69EF)S{&TSFf*5mNi+;df<0
z2Qg|<`(|n6SH3hKJ1VDqbh}lPm-0c1lxLcpGXB+ytWqHALz@s%q8grrG)>kGu1T~i
zgtv=&FYx^l?pEZw^jejyDpChW-~`jPq7`k0imJpDDNqV4uDnsC*lMkpn*77?i)!*B
z{$wu*ttHi<hlTVym7=~}0*n+_8{!&{(O#128tCO6)y%2>IZaL&ta*y3gaO~VwB7qu
zpD^1V%|Ib&HwNum|La<le;J8j5l^$|FpXnry9cRpQuQY_d4@7{9xx6%HW+J}nKzY|
z7b>KQ3!41f*oS)Q2l?p%k7+HOq$7wB6|bo&8ciBGL6KLQM7!cMU(#+-kB}^Bk$Wt?
z?vDibsQyJwo}g;d7qi+|si+TwRBZr$oO-KLg3JR9>D#_cS?F&Jw>gTPM<A4^e61%=
zzIu*O&A#f3-R*&n#<p`EIO^!lxez?x)!o_L6+BaeYdLXETOiPL8h3Jac#LbWB6k7q
z27PAWQ+@$)_CN6~#D5>c$05!O=aoO<Zo2u#yBtEd0XG2G06l=SfObF&U_YP=unyn=
zuz+Q7_zw6CAa{ockSabte3-w-Jt}|CSBw@}9ECQ)BH3&kTo#wG!zMUgWW#FNw$X*y
rZ$<9oPSGh;3nhYQd#P(Pc6fzca>>iU%>}cp#1-B`raFAUo1gIqU=$<d

delta 1016
zcmY*YT}TvB6uzU&x~}WYm^O;ZwxfeZ;15M1^lQ5N;%dpdDJjWP8=C8C?nng13X|e6
z-Y9QAMK4iLJw&aP4?XOvpyCD#`Cw$ZpwSWrKKRf>Q0LB$<_>&w&v(vu&OP_enbk37
zZH##&=a$(J>d!)`?D756xf3ixAqJs|H?gK{ri<j8nnZ0dWP9K_@wDR=_od;R#|K(e
z0^sWr%A+f}YdRv%0E0vnHP#(ibAV49{0WJf4l#9+ucq@k#9_09*Rv7QMmFI6H<<z<
z>d;0$>CCHsZ@=PEw%oeA6DvD~AVumdR<_etqhwNxq|{UeLTU_?D5PO!D;;Z-EGmuL
zq|`9PN2A<Sblka&mEU_+QebsML8Hv2bQxun3V5tsh7&@}qPC^W)X=yyzSl<#D@k3d
zIph0vIl3;PH777h5H`O!yirawS2XVmR_Lbx_gtb8IM8Z_H=^rTvGOPF2Ej^(VA4oS
zWO(oCX=|Ey4J&ayvH<NP6xPq7U)5D3aWNyYQBO=_1r_byaAunoRIq>}$!vPV^E8>q
z+P2Q3=~A-9!$sLtw{h=hq|`5w9($9^f9G5tjml>=?<Q70kXH7fbq+#WGte0_$QD^&
z>J%E7CJ))N#xPK2-raevdua|PqQP}>ICvxAZ}Ii}>4Y>41Z96v4%N7Zz;kC{s4rCG
z8T1YH1^m@FcU@$jy?wwJ2n<|Dy}@3&y;tt>wz=xa1x_NjI2VJ+YtDa?4mu3J{w%_r
z&H~Tf$K$|v9~%D%ydY9g`<|P0@GZ|cgr)%FfH0sR&;#fKxB+#5;{XAW2Veldp~6qV
zI)MHdJb>=v<|D2AbM9^JXTIY_iJ2|73TB5@5UrxwE&wUDQ;)@5eb|mnKS~^xj-yhk
oAPVJzc<PwFk~WzIurt&`^h4@4{jIAEyOvbd7c=J~&icZve?o;8asU7T

diff --git a/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.h b/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.h
index 588a66d52..0343c02ec 100644
--- a/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.h
+++ b/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.h
@@ -10,10 +10,10 @@ extern "C" {
 /*
  * Class:     net_java_sip_communicator_impl_sparkle_SparkleActivator
  * Method:    initSparkle
- * Signature: ()V
+ * Signature: (Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_sparkle_SparkleActivator_initSparkle
-  (JNIEnv *, jclass);
+  (JNIEnv *, jclass, jstring);
 
 #ifdef __cplusplus
 }
diff --git a/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.m b/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.m
index 1f60c6580..a41576716 100644
--- a/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.m
+++ b/src/native/macosx/sparkle/net_java_sip_communicator_impl_sparkle_SparkleActivator.m
@@ -16,21 +16,22 @@
 /*
  * Class:     net_java_sip_communicator_impl_sparkle_SparkleActivator
  * Method:    initSparkle
- * Signature: ()V
+ * Signature: (Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL 
 Java_net_java_sip_communicator_impl_sparkle_SparkleActivator_initSparkle
-  (JNIEnv *env, jclass obj)
+  (JNIEnv *env, jclass obj, jstring pathToSparkleFramework)
 {
     bool haveBundle = ([[NSBundle mainBundle] 
                         objectForInfoDictionaryKey:@"CFBundleName"] != nil);
-    
-    NSString* path = [[NSString alloc]
-                initWithUTF8String:"Contents/Frameworks/Sparkle.framework"];
-    NSBundle* bundle = [NSBundle bundleWithPath:path];
+    const char *path = (*env)->GetStringUTFChars(env, pathToSparkleFramework, 0);  
+
+    NSBundle* bundle = [NSBundle bundleWithPath:[NSString stringWithCString: path]];
     Class suUpdaterClass = [bundle classNamed:@"SUUpdater"];
     id suUpdater = [[suUpdaterClass alloc] init];
-    
+   
+    (*env)->ReleaseStringUTFChars(env, pathToSparkleFramework, path);  
+ 
     NSMenu* menu = [[NSApplication sharedApplication] mainMenu];
     NSMenu* applicationMenu = [[menu itemAtIndex:0] submenu];
     NSMenuItem* checkForUpdatesMenuItem = [[NSMenuItem alloc]
diff --git a/src/net/java/sip/communicator/impl/sparkle/SparkleActivator.java b/src/net/java/sip/communicator/impl/sparkle/SparkleActivator.java
index ebe951c54..4823be680 100644
--- a/src/net/java/sip/communicator/impl/sparkle/SparkleActivator.java
+++ b/src/net/java/sip/communicator/impl/sparkle/SparkleActivator.java
@@ -20,7 +20,7 @@ public class SparkleActivator
     private static Logger logger = Logger.getLogger(SparkleActivator.class);
     
     // Native method declaration
-    public native static void initSparkle();
+    public native static void initSparkle(String pathToSparkleFramework);
 
    /**
      * Dynamically loads JNI object. Will fail if non-MacOSX 
@@ -38,7 +38,8 @@ public class SparkleActivator
      */
     public void start(BundleContext bundleContext) throws Exception
     {
-        initSparkle();
+        // TODO: better way to get the Sparkle Framework path?
+        initSparkle(System.getProperty("user.dir") + "/../../Frameworks/Sparkle.framework");
         logger.info("Sparkle Plugin ...[Started]");
     }