From: Jaehwa Shin <jaehwa.shin@samsung.com>
Date: Sat, 8 Jun 2013 05:06:51 +0000 (+0900)
Subject: Fix DCM-1924
X-Git-Tag: accepted/tizen/20130912.185832~42^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76a7b05c9de283ab265e20c89920fb1d75721e1d;p=platform%2Fframework%2Fnative%2Fsocial.git

Fix DCM-1924

Change-Id: If6a5c754eea43b1e631b2451b2bb9494eb0f01d5
Signed-off-by: Jaehwa Shin <jaehwa.shin@samsung.com>
---

diff --git a/src/FScl_ContactImpl.cpp b/src/FScl_ContactImpl.cpp
index fd6177d..d48ca3f 100644
--- a/src/FScl_ContactImpl.cpp
+++ b/src/FScl_ContactImpl.cpp
@@ -56,8 +56,6 @@ using namespace Tizen::Io;
 namespace Tizen { namespace Social
 {
 
-extern const wchar_t OTHER_LABEL[] = L"Other";
-
 const int __CONTACT_CHANGED_TIME_YEAR_OFFSET  = 1900;
 const int __CONTACT_CHANGED_TIME_MONTH_OFFSET = 1;
 
@@ -1741,6 +1739,14 @@ _ContactImpl::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;
@@ -3091,6 +3097,14 @@ _ContactImpl::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;
@@ -3885,6 +3899,12 @@ _ContactImpl::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:
diff --git a/src/FScl_ImAddressImpl.cpp b/src/FScl_ImAddressImpl.cpp
index 90a9548..23ba872 100644
--- a/src/FScl_ImAddressImpl.cpp
+++ b/src/FScl_ImAddressImpl.cpp
@@ -39,6 +39,8 @@ extern const wchar_t IM_ADDRESS_MSN[] = L"MSN";
 extern const wchar_t IM_ADDRESS_QQ[] = L"QQ";
 extern const wchar_t IM_ADDRESS_SKYPE[] = L"Skype";
 extern const wchar_t IM_ADDRESS_YAHOO[] = L"Yahoo";
+extern const wchar_t IM_ADDRESS_IRC[] = L"IRC";
+extern const wchar_t IM_ADDRESS_FACEBOOK[] = L"Facebook";
 
 _ImAddressImpl::_ImAddressImpl(void)
 {
diff --git a/src/FScl_ImAddressImpl.h b/src/FScl_ImAddressImpl.h
index 52fd1e2..d5e5b9a 100644
--- a/src/FScl_ImAddressImpl.h
+++ b/src/FScl_ImAddressImpl.h
@@ -29,6 +29,9 @@
 namespace Tizen { namespace Social
 {
 
+extern const wchar_t IM_ADDRESS_IRC[];
+extern const wchar_t IM_ADDRESS_FACEBOOK[];
+
 class ImAddress;
 
 class _OSP_EXPORT_ _ImAddressImpl
diff --git a/src/FScl_UserProfileImpl.cpp b/src/FScl_UserProfileImpl.cpp
index 4fd372b..c0a3083 100644
--- a/src/FScl_UserProfileImpl.cpp
+++ b/src/FScl_UserProfileImpl.cpp
@@ -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: