Build issue fix.

Change-Id: Ie0a1999e0fe018c41721d9e90d95de6056c34e0e
Signed-off-by: GAURAV JAIN <gaurav.j3@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00ee402..4f873fb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ ADD_EXECUTABLE (${this_target} ${${this_target}_SOURCE_FILES})
 \r
 # Set link libraries and link options\r
 ## TODO : add more link libraries and options\r
-TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp osp-appfw osp-uifw osp-social osp-media osp-image osp-content osp-telephony msg_mapi)\r
+TARGET_LINK_LIBRARIES(${this_target} -L/usr/lib/osp osp-appfw osp-uifw osp-social osp-media osp-image osp-content osp-telephony osp-shell msg_mapi)\r
 TARGET_LINK_LIBRARIES(${this_target} -Xlinker --allow-shlib-undefined -pthread -pie)\r
 \r
 # Copy info, data, res, and icons directories\r

diff --git a/packaging/apps.Messages.spec b/packaging/apps.Messages.spec
index 55fa69b..1e2bbe6 100644 (file)
--- a/packaging/apps.Messages.spec
+++ b/packaging/apps.Messages.spec
@@ -16,6 +16,7 @@ BuildRequires:  pkgconfig(osp-image)
 BuildRequires:  pkgconfig(osp-messaging)
 BuildRequires:  pkgconfig(osp-image-core)
 BuildRequires:  pkgconfig(osp-telephony)
+BuildRequires:  pkgconfig(osp-shell)
 
 Requires: osp-installer
 

diff --git a/res/eng-GB.xml b/res/eng-GB.xml
index e35a24e..559259f 100644 (file)
--- a/res/eng-GB.xml
+++ b/res/eng-GB.xml
@@ -143,4 +143,5 @@
     <text id="IDS_VIDEO">Video</text>
     <text id="IDS_AUDIO">Audio</text>
     <text id="IDS_MSG_HEADER_SELECT_RECIPIENT">Select recipient</text>
+    <text id="IDS_COM_BODY_VOLUME">Volume</text>
 </string_table>

diff --git a/res/eng-PH.xml b/res/eng-PH.xml
index 4f56c4a..913acf2 100644 (file)
--- a/res/eng-PH.xml
+++ b/res/eng-PH.xml
@@ -143,4 +143,5 @@
     <text id="IDS_VIDEO">Video</text>
     <text id="IDS_AUDIO">Audio</text>
     <text id="IDS_MSG_HEADER_SELECT_RECIPIENT">Select recipient</text>
+    <text id="IDS_COM_BODY_VOLUME">Volume</text>
 </string_table>

diff --git a/res/eng-US.xml b/res/eng-US.xml
index 4dc7c92..b19ffed 100644 (file)
--- a/res/eng-US.xml
+++ b/res/eng-US.xml
@@ -143,4 +143,5 @@
     <text id="IDS_VIDEO">Video</text>
     <text id="IDS_AUDIO">Audio</text>
     <text id="IDS_MSG_HEADER_SELECT_RECIPIENT">Select recipient</text>
+    <text id="IDS_COM_BODY_VOLUME">Volume</text>
 </string_table>

diff --git a/res/screen-size-normal/IDL_VOLUME_POPUP.xml b/res/screen-size-normal/IDL_VOLUME_POPUP.xml
index 5038668..6516b0b 100644 (file)
--- a/res/screen-size-normal/IDL_VOLUME_POPUP.xml
+++ b/res/screen-size-normal/IDL_VOLUME_POPUP.xml
@@ -5,7 +5,7 @@
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
 <ScenePopup Bversion="2.0.0.201302151552" Dversion="20120315">
     <Popup id="IDL_VOLUME_POPUP">
-        <property color="" titleText="::IDS_COM_BODY_SETTINGS" titleTextColor=""/>
+        <property color="" titleText="::IDS_COM_BODY_VOLUME" titleTextColor=""/>
         <layout height="263" mode="Portrait" style="" type="NONE" width="720"/>
         <layout height="263" mode="Landscape" style="" type="NONE" width="720"/>
     </Popup>

diff --git a/src/MsgMmsSlideData.cpp b/src/MsgMmsSlideData.cpp
index a3e7eec..2745bd4 100644 (file)
--- a/src/MsgMmsSlideData.cpp
+++ b/src/MsgMmsSlideData.cpp
@@ -59,12 +59,15 @@ MmsSlideData::Construct(MessageData* pMessageData)
                __pSlideList = new (std::nothrow) ArrayList();\r
                __pSlideList->Construct();\r
                const ArrayList* pPageList = pMessageData->GetPageList();\r
-               for (int pageIndex = 0; pageIndex < pPageList->GetCount(); pageIndex++)\r
+               if (pPageList )\r
                {\r
-                       MmsPageData* pPageData = (MmsPageData*) pPageList->GetAt(pageIndex);\r
-                       MmsSlideType slideType = GetSlideType(pPageData);\r
-                       MmsSlideBase* pMmsSlide = new (std::nothrow) MmsMediaSlide(*pPageData, slideType);\r
-                       __pSlideList->Add(pMmsSlide);\r
+                       for (int pageIndex = 0; pageIndex < pPageList->GetCount(); pageIndex++)\r
+                       {\r
+                               MmsPageData* pPageData = (MmsPageData*) pPageList->GetAt(pageIndex);\r
+                               MmsSlideType slideType = GetSlideType(pPageData);\r
+                               MmsSlideBase* pMmsSlide = new (std::nothrow) MmsMediaSlide(*pPageData, slideType);\r
+                               __pSlideList->Add(pMmsSlide);\r
+                       }\r
                }\r
                // Check Need to create attachment slide or not.\r
                const ArrayList* pAttachList = pMessageData->GetAttachList();\r