Corrects setting IM address for MacOsX address book (default IM label set to "work").

src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookContactQuery.java

@@ -1331,11 +1331,9 @@ else if(subCategories.contains(SubCategory.ICQ))
                     return kABICQInstantProperty;
                 else if(subCategories.contains(SubCategory.MSN))
                     return kABMSNInstantProperty;
-                else if(subCategories.contains(
-                            SubCategory.Jabber))
+                else if(subCategories.contains(SubCategory.Jabber))
                     return kABJabberInstantProperty;
-                else if(subCategories.contains(
-                            SubCategory.Yahoo))
+                else if(subCategories.contains(SubCategory.Yahoo))
                     return kABYahooInstantProperty;
                 break;
             case Phone:

src/net/java/sip/communicator/plugin/addrbook/macosx/MacOSXAddrBookSourceContact.java

@@ -95,16 +95,35 @@ public void addContactDetail(ContactDetail detail)
                         .getSubPropertyLabel();
                 }
 
-                if(subProperty == null
-                        && property
-                            == MacOSXAddrBookContactQuery.kABAddressProperty)
+                if(subProperty == null)
                 {
-                    if(detail.containsSubCategory(SubCategory.Home))
-                        subProperty
-                            = MacOSXAddrBookContactQuery.kABAddressHomeLabel();
-                    else
-                        subProperty
-                            = MacOSXAddrBookContactQuery.kABAddressWorkLabel();
+                    if(property == MacOSXAddrBookContactQuery
+                            .kABAddressProperty)
+                    {
+                        if(detail.containsSubCategory(SubCategory.Home))
+                            subProperty = MacOSXAddrBookContactQuery
+                                .kABAddressHomeLabel();
+                        else
+                            subProperty = MacOSXAddrBookContactQuery
+                                .kABAddressWorkLabel();
+                    }
+                    else if(property == MacOSXAddrBookContactQuery
+                            .kABAIMInstantProperty
+                            || property == MacOSXAddrBookContactQuery
+                                .kABICQInstantProperty
+                            || property == MacOSXAddrBookContactQuery
+                                .kABJabberInstantProperty
+                            || property == MacOSXAddrBookContactQuery
+                                .kABMSNInstantProperty
+                            || property == MacOSXAddrBookContactQuery
+                                .kABYahooInstantProperty)
+                    {
+                        subProperty = MacOSXAddrBookContactQuery
+                            .kABAddressWorkLabel();
+
+
+
+                    }
                 }
 
                 List<String> values