Remove location(map) item from more options.

Change-Id: I8c31b36be2fb0dd74709e6e843fae024622946fd
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/src/Conversation/Controller/inc/ConvFrame.h b/src/Conversation/Controller/inc/ConvFrame.h
index adf6856fed05716b659dd9b535792568f458a7d4..dc34f9893645f801860ecc12950785b41bef17d9 100644 (file)
--- a/src/Conversation/Controller/inc/ConvFrame.h
+++ b/src/Conversation/Controller/inc/ConvFrame.h
@@ -86,7 +86,6 @@ namespace Msg
             enum MorOptionItemType{
                 MorOptionReply,
                 MorOptionCall,
-                MorOptionLocation,
                 MorOptionRecip,
                 MorOptionBlock,
                 MorOptionUnblock,

diff --git a/src/Conversation/Controller/src/ConvFrame.cpp b/src/Conversation/Controller/src/ConvFrame.cpp
index ac27cfd4b5a4b95ee7b5a041a2372cb1844c51f1..5d1cc4493aea05a3ad57878c3cb325030b625d9d 100644 (file)
--- a/src/Conversation/Controller/src/ConvFrame.cpp
+++ b/src/Conversation/Controller/src/ConvFrame.cpp
@@ -133,8 +133,6 @@ void ConvFrame::prepareMoreOption()
             {nullptr, "WDS_MSG_OPT_REPLY_ABB", REPLY_MORE_ICON, makeCbLast(&ConvFrame::onReplyClicked)};
         m_MoreOptionItemsInfo[MorOptionCall] =
             {nullptr, "WDS_MSG_OPT_CALL_ABB", CALL_MORE_ICON, makeCbLast(&ConvFrame::onCallClicked)};
-        m_MoreOptionItemsInfo[MorOptionLocation] =
-            {nullptr, "WDS_MAPS_OPT_SEND_MY_LOCATION_ABB", SHARE_LOC_MORE_ICON, makeCbLast(&ConvFrame::onSendMyLocationClicked)};
         m_MoreOptionItemsInfo[MorOptionRecip] =
             {nullptr, "WDS_MSG_OPT_RECIPIENTS_ABB", RECIP_MORE_ICON, makeCbLast(&ConvFrame::onRecipientsClicked)};
         m_MoreOptionItemsInfo[MorOptionBlock] =
@@ -239,14 +237,12 @@ void ConvFrame::updateMoreOption()
 {
     bool isValid = m_pList->getRecip().isValid();
     if (isValid) {
-        prepedItem(MorOptionLocation);
         prepedItem(MorOptionCall);
         prepedItem(MorOptionReply);
 
     } else {
         removeItem(MorOptionReply);
         removeItem(MorOptionCall);
-        removeItem(MorOptionLocation);
     }
 }