diff options
| author | Vincent Lucas <chenzo@jitsi.org> | 2013-05-15 15:54:54 +0200 |
|---|---|---|
| committer | Vincent Lucas <chenzo@jitsi.org> | 2013-05-15 15:54:54 +0200 |
| commit | 2bfae8696e32a5d9b00188273447cf9ab8b567b9 (patch) | |
| tree | ee57b33a2cd6a7158818fc495e1964c5c03a8043 | |
| parent | 2242162742ad6622e7abc367ea4d3cf673641d29 (diff) | |
| download | jitsi-2bfae8696e32a5d9b00188273447cf9ab8b567b9.zip jitsi-2bfae8696e32a5d9b00188273447cf9ab8b567b9.tar.gz jitsi-2bfae8696e32a5d9b00188273447cf9ab8b567b9.tar.bz2 | |
Corrects getting and setting work postal address without conflicting with the "this is the mailing address" checkbox.
| -rw-r--r-- | src/native/addrbook/msoutlook/MsOutlookAddrBookContactQuery.cxx | 20 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java | 11 |
2 files changed, 25 insertions, 6 deletions
diff --git a/src/native/addrbook/msoutlook/MsOutlookAddrBookContactQuery.cxx b/src/native/addrbook/msoutlook/MsOutlookAddrBookContactQuery.cxx index 3abb648..daa7670 100644 --- a/src/native/addrbook/msoutlook/MsOutlookAddrBookContactQuery.cxx +++ b/src/native/addrbook/msoutlook/MsOutlookAddrBookContactQuery.cxx @@ -1501,6 +1501,26 @@ int MsOutlookAddrBookContactQuery_IMAPIProp_1SetPropString { updateValue.ulPropTag = 0x8046001F; } + else if(propId == 0x8045) // business address - street + { + updateValue.ulPropTag = 0x805F001F; + } + else if(propId == 0x8046) // business address - city + { + updateValue.ulPropTag = 0x8060001F; + } + else if(propId == 0x8047) // business address - state + { + updateValue.ulPropTag = 0x8061001F; + } + else if(propId == 0x8048) // business address - zip + { + updateValue.ulPropTag = 0x8062001F; + } + else if(propId == 0x8049) // business address - country + { + updateValue.ulPropTag = 0x8063001F; + } else { updateValue.ulPropTag = PROP_TAG(PT_UNICODE, propId); diff --git a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java index c2bf8c8..d529526 100644 --- a/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java +++ b/src/net/java/sip/communicator/plugin/addrbook/msoutlook/MsOutlookAddrBookContactQuery.java @@ -75,12 +75,11 @@ public class MsOutlookAddrBookContactQuery 0x3A51 /* PR_BUSINESS_HOME_PAGE */, 0x3A17 /* PR_TITLE */, 0x00008062 /* dispidInstMsg */, - 0x3A27, // PR_BUSINESS_ADDRESS_CITY - 0x3A26, // PR_BUSINESS_ADDRESS_COUNTRY - 0x3A2A, // PR_BUSINESS_ADDRESS_POSTAL_CODE - 0x3A28, // PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE - 0x3A29, // PR_BUSINESS_ADDRESS_STREET - + 0x00008046, // PR_BUSINESS_ADDRESS_CITY + 0x00008049, // PR_BUSINESS_ADDRESS_COUNTRY + 0x00008048, // PR_BUSINESS_ADDRESS_POSTAL_CODE + 0x00008047, // PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE + 0x00008045, // PR_BUSINESS_ADDRESS_STREET 0x3A59, // PR_HOME_ADDRESS_CITY 0x3A5A, // PR_HOME_ADDRESS_COUNTRY 0x3A5B, // PR_HOME_ADDRESS_POSTAL_CODE |