Init Tizen 2.2.1

[framework/osp/social.git] / src / FScl_UserProfileImpl.cpp

diff --git a/src/FScl_UserProfileImpl.cpp b/src/FScl_UserProfileImpl.cpp
index 4fd372b..a3a5e2e 100644 (file)
--- a/src/FScl_UserProfileImpl.cpp
+++ b/src/FScl_UserProfileImpl.cpp
@@ -76,7 +76,7 @@ _UserProfileImpl::_UserProfileImpl(void)
 {
        contacts_record_h profileHandle = null;
 
-       SysTryReturnVoidResult(NID_SCL, _ContactDbConnector::EnsureDbConnection() == E_SUCCESS, E_SYSTEM, "[%s] A system error has been occurred.", GetErrorMessage(E_SYSTEM));
+       _AddressbookUtil::InitContactViews();
 
        int ret = contacts_record_create(_contacts_my_profile._uri, &profileHandle);
        SysTryReturnVoidResult(NID_SCL, ret == CONTACTS_ERROR_NONE, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
@@ -89,7 +89,7 @@ _UserProfileImpl::_UserProfileImpl(const _UserProfileImpl& rhs)
 {
        contacts_record_h profileHandle = null;
 
-       SysTryReturnVoidResult(NID_SCL, _ContactDbConnector::EnsureDbConnection() == E_SUCCESS, E_SYSTEM, "[%s] A system error has been occurred.", GetErrorMessage(E_SYSTEM));
+       _AddressbookUtil::InitContactViews();
 
        int ret = contacts_record_clone(rhs.__profileHandle, &profileHandle);
        SysTryReturnVoidResult(NID_SCL, ret == CONTACTS_ERROR_NONE, E_OUT_OF_MEMORY, "[%s] Memory allocation failed.", GetErrorMessage(E_OUT_OF_MEMORY));
@@ -1306,6 +1306,14 @@ _UserProfileImpl::SetImAddressAt(int index, const ImAddress& imAddress)
        {
                type = CONTACTS_MESSENGER_TYPE_JABBER;
        }
+       else if (stringValue == IM_ADDRESS_IRC)
+       {
+               type = CONTACTS_MESSENGER_TYPE_IRC;
+       }
+       else if (stringValue == IM_ADDRESS_FACEBOOK)
+       {
+               type = CONTACTS_MESSENGER_TYPE_FACEBOOK;
+       }
        else
        {
                type = CONTACTS_MESSENGER_TYPE_CUSTOM;
@@ -2184,6 +2192,14 @@ _UserProfileImpl::AddImAddress(const ImAddress& imAddress)
        {
                type = CONTACTS_MESSENGER_TYPE_JABBER;
        }
+       else if (stringValue == IM_ADDRESS_IRC)
+       {
+               type = CONTACTS_MESSENGER_TYPE_IRC;
+       }
+       else if (stringValue == IM_ADDRESS_FACEBOOK)
+       {
+               type = CONTACTS_MESSENGER_TYPE_FACEBOOK;
+       }
        else
        {
                type = CONTACTS_MESSENGER_TYPE_CUSTOM;
@@ -3333,6 +3349,12 @@ _UserProfileImpl::GetImAddressesN(void) const
                case CONTACTS_MESSENGER_TYPE_JABBER:
                        pImAddress->SetServiceProviderName(IM_ADDRESS_JABBER);
                        break;
+               case CONTACTS_MESSENGER_TYPE_IRC:
+                       pImAddress->SetServiceProviderName(IM_ADDRESS_IRC);
+                       break;
+               case CONTACTS_MESSENGER_TYPE_FACEBOOK:
+                       pImAddress->SetServiceProviderName(IM_ADDRESS_FACEBOOK);
+                       break;
                case CONTACTS_MESSENGER_TYPE_CUSTOM:
                        // fall through
                default: