From f704de5658ecdc34e479aa2a88a93bdc125719f2 Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Fri, 18 Feb 2011 11:23:58 +0000
Subject: [PATCH] Fixes (the fix for) an issue reported by Emil Ivov and found
 to cause modifications to the Mac OS X Address Book to not be picked up by
 SIP Communicator upon subsequent searches.

---
 lib/native/mac/libjmacosxaddrbook.jnilib      | Bin 74536 -> 74536 bytes
 ...drbook_macosx_MacOSXAddrBookContactQuery.m |  10 ++++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/native/mac/libjmacosxaddrbook.jnilib b/lib/native/mac/libjmacosxaddrbook.jnilib
index d355086e2a2f10ffc57ab6f590bcfdd75c1ea21b..04f8ebd418b9735b9f72f91eb1aa6d6ed00de2d1 100755
GIT binary patch
delta 2680
zcmaJ@4Qx}_6+X{)NWuc|CB!35Kyey}gtcJOHQ*9w#DM8z4Xo?xEt^W0Z8WqJsyqp_
zhvwv&*qL~JM0ImRlOk3kN)WVk^5kq?q21ho5>TQk9WF#9)2z)MLFpE!1O&;Fw{x#=
zI##q@=^cOHz2|)Ap7VaLPxo6+_gf-ER_V|ui`TxI>~mkd@#3+69QDVeW7Zp@WmwxW
zL<Y(p6^6-lnGLOV)hc0#xK?dbhc%0R{KM4%p_mw&0{}hv<3a#!tKFh|hqZkBcsDL;
zp18hzV5>a`9YFWw;BuDki3>66r@8D#d&ES&Mp{wDXBY-9Quwj}P<dy-lcaGI-mtb0
z<AU4%lR%{zHem+co1;BTb0#<Al)hs`>(lOzx6PweCQT3yn*ru8iJ@hvzAflUnyUB5
z#n4hrz(mP6sVG(Ou#zS!?$^9ea^rtVN>sCT4{F{#j|+`q5-xuj8x$?K3u9!Y+_r0s
zin1Mqum;VOpmjN!i0<?0!OaWBr1P%Cyx5c+t?#3mVhojZPl9#J`-RX|t?%a5IV{XO
z67^O*T%V1)OZ)&5L<51t7O7_D`NujA7AzlJP7av1Y^;c`XiY9AQn)DhZj)v{<<BuI
zHHQHX9+v8eD_kmEBn{zmp@1Ahe3G0E8yU|z`*U6-k=Gs(d}Qpk(u@vgPtJ41(!NEQ
zCUUz&_>9@Z%r-FVWL6?h;y@p2hnWpCThFYWRCG9m5oSMN_B69wnRStZBP-Q|#_;Cj
zkl{aCdLS%7mO5@a)lp)E{mn&+|2K~){`l7w|GjF(-D2u>{Sd&V0@Q2*2%ab$5B#L)
z@t{_iR8LMQPt6-<HS{;d|3Z<XZn?s^BM9Jr6I_AkG4413oezWx6TuUUY|Q_R`4s6r
z@>SK8)qowP(o_m%o&Q@-SaF}!H1(tMYT2OTi~;x+On>2)@;ytID_~mmxIa7H{+$6!
ziT~$C2iz^fn4^nsOBkZ%&{C?`ccTdawEVSjtmSgyNCN=St2udIQF|u7s7HNaR8fC{
zHSWeF<%2|hy~4J)`C{||C+8Rl3r+*CSGereAA(SQ3{2`TV^I61v0Da#mAsJYzS3P^
zDxDN{uBeI!Oy*+`)&jk(wSU0g{RMk~b*sBa6=zRY(%GN&8QI%el9z6IJb1#)dWGxc
zc<1`BoP0-VZhcERhj*VOIv-lrII28l7(>ny@CEQGVDmX$8%=lTqH@=hCgDgld^EGX
z2AcwF=o^gB{yH=sj-80>Ij%?S<2Z(xz3~868;O5ZEz}aJ&!O4?%-<H7PTtdqdpV8(
zSV}n#Aby481me%rc$ox{v5R9L;z5pU0TxxJaXuh^gU=5GWM*^RjrgacupZYTe;tx*
zJfHy}%gu2Z@d=J&0NEKFr=rt+9V_z^OKCK~Hu@F7kyuKarNU@$;;cp5vTCyL+^-vd
z^~qVivgxAv`%&MgzU=nNjAhHG48#2$qfE>N5R1VmTbfG>CXZ&dX937<)-X9Yx!Tsq
zNEMwMUxObwPi1oADz5HK&p$)VsmC&}NdSiRW8z9}SbPSttPL2}Zqk%;EDj*8(<Tk;
z&&Y36C2p^Xt2$i1;FYycWgVOL|GDQ&>mD+a+C;9UBvL*lkte4lVF__g6_Y)PZWCo{
z1&L1;s&$$tBDdZVLp^vqWqsuznM%zby0x~d2r|R^Hl5S@IHy~@5{m8Hvt75?WxdOp
z!CZULiS7Ov^X{+HZWvc+RO_F_kc{HYUHe$~ejw}nW4K(WclpTP&+}EWI6&`&SWG|o
zY!^>Z4ZY?%{b{Qz!XLwGWx8}1l=EGPp?}hdwyFWVtt|cT5y+b7QhIm$FUi84%FD9u
zjnEB+8*sDRwE>x)DJN-Uu<4QtVrV;VuyWK>d1qorV_4R%qvGEe6#vW=``v9jg*x4X
zIx{FW-iap?&B0`Cne?pO_g&ez;12ei<mz2`aNef+OiEvnYDr5`nXTFsSF-JRP)cl7
z@Co7_A?mGnvkg4JFyJPTs_AJVNWOM^vnh2i`tog4#u5<0k`lobkwA!$rkQF%ChyN|
zz{6;2=36-9p4}ig$$?o19$IH+9j3d}<ofJdJXx~;<q&>Ho<Q40UP7yoH_+CT%V?eC
z9@+x3dJY3_ksr*_0Bw#2ypOhv+(fI8hvsR(_IXFP^A>Iy$D!!K`S<cF7hbeA*arGN
zna0}bsKtwYU+^x{@ho1HM>=216&!gDe7Xjw=$o4oJKxR~)~Z+=8>9HYht9`1{|5d|
zp*+F)yPOYmo^RngoclQke3j|A!MTldFFqkuPvZQ1nyc_MpD10FcBti?aK4W7S<V|c
m{}DbLRM5xyAm;(jAH~lDT@Q2qD(Bst-(&o}t9imR(!T+O8h^L|

delta 2572
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

diff --git a/src/native/addrbook/macosx/net_java_sip_communicator_plugin_addrbook_macosx_MacOSXAddrBookContactQuery.m b/src/native/addrbook/macosx/net_java_sip_communicator_plugin_addrbook_macosx_MacOSXAddrBookContactQuery.m
index 780431a42..1dcf2353d 100644
--- a/src/native/addrbook/macosx/net_java_sip_communicator_plugin_addrbook_macosx_MacOSXAddrBookContactQuery.m
+++ b/src/native/addrbook/macosx/net_java_sip_communicator_plugin_addrbook_macosx_MacOSXAddrBookContactQuery.m
@@ -190,33 +190,31 @@ MacOSXAddrBookContactQuery_idToJObject
             jo = joArray;
             if (joArray)
             {
-                NSUInteger j, j1;
+                NSUInteger j, j2;
 
                 for (j = 0; j < mvCount; j++)
                 {
+                    j2 = j * 2;
                     MacOSXAddrBookContactQuery_idToJObject(
                         jniEnv,
                         [mv valueAtIndex:j],
-                        joArray, j,
+                        joArray, j2,
                         objectClass);
                     if (JNI_TRUE == (*jniEnv)->ExceptionCheck(jniEnv))
                     {
                         jo = NULL;
                         break;
                     }
-                    /* Because the compiler says ++j may be undefined for j. */
-                    j1 = j + 1;
                     MacOSXAddrBookContactQuery_idToJObject(
                         jniEnv,
                         [mv labelAtIndex:j],
-                        joArray, j1,
+                        joArray, j2 + 1,
                         objectClass);
                     if (JNI_TRUE == (*jniEnv)->ExceptionCheck(jniEnv))
                     {
                         jo = NULL;
                         break;
                     }
-                    j = j1;
                 }
             }
         }