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: 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.

---
 ...nicator_plugin_addrbook_macosx_MacOSXAddrBookContactQuery.m | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/native/addrbook/macosx')

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 780431a..1dcf235 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;
                 }
             }
         }
-- 
cgit v1.1