Fix app name issue and Change systeminfo api

Change-Id: If53fa5d755d8928581a51fdb20a2a04109369236
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>

diff --git a/.cproject b/.cproject
index a867f3b..0a69562 100755 (executable)
--- a/.cproject
+++ b/.cproject
@@ -140,6 +140,7 @@
                                                                </option>
                                                                <option id="gnu.cpp.link.option.libs.850444138" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
                                                                        <listOptionValue builtIn="false" value="pkgmgr_parser"/>
+                                                                       <listOptionValue builtIn="false" value="capi-system-info"/>
                                                                        <listOptionValue builtIn="false" value="cert-svc"/>
                                                                        <listOptionValue builtIn="false" value="cert-svc-vcore"/>
                                                                        <listOptionValue builtIn="false" value="dpl-efl"/>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0db9fd..502c3db 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions -fvisibility=hidden")
 SET(CMAKE_CXX_FLAGS "${OSP_DEBUG_FLAGS} ${OSP_OPT_FLAGS} ${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} ${OSP_COMPILER_FLAGS}")
 
 TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw -lxml2 -lpkgmgr_installer -lpkgmgr_parser -lglib-2.0 -lapp2ext -ldl" -Wl,--allow-shlib-undefined)
-TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib -lcert-svc-vcore -ldpl-efl -lcert-svc")
+TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib -lcert-svc-vcore -ldpl-efl -lcert-svc -lcapi-system-info")
 
 ADD_SUBDIRECTORY(plugin)
 

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index 65df5d1..a9455c1 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130410.2]"
+#define OSP_INSTALLER_VERSION "version=[20130410.3]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"

diff --git a/src/XmlHandler/ManifestHandler.cpp b/src/XmlHandler/ManifestHandler.cpp
index d66ff6e..dcdf029 100755 (executable)
--- a/src/XmlHandler/ManifestHandler.cpp
+++ b/src/XmlHandler/ManifestHandler.cpp
@@ -19,8 +19,9 @@
  * @brief      This is the implementation file for %ManifestHandler class.
  */
 
+#include <system_info.h>
+
 #include <FIoFile.h>
-#include <FSys_SystemInfoImpl.h>
 #include <FBase_StringConverter.h>
 
 #include "ManifestHandler.h"
@@ -35,7 +36,6 @@ using namespace Tizen::Base::Collection;
 using namespace Tizen::Base::Utility;
 using namespace Tizen::App;
 using namespace Tizen::Io;
-using namespace Tizen::System;
 
 ManifestHandler::ManifestHandler(void)
 :__pContext(null)
@@ -398,19 +398,22 @@ ManifestHandler::OnServiceAppStartElement(void)
 bool
 ManifestHandler::OnIconsStartElement(void)
 {
-       result r = E_SUCCESS;
+       int res = 0;
        int width = 0;
        String defaultIconType;
 
        AppLog("<Icons>");
 
-       r = _SystemInfoImpl::GetSysInfo(L"ScreenWidth", width);
-       if (IsFailed(r))
+       res = system_info_get_value_int(SYSTEM_INFO_KEY_SCREEN_WIDTH, &width);
+       if (res != SYSTEM_INFO_ERROR_NONE)
        {
+               fprintf(stderr, "  ## system_info_get_value_int() failed. result = [%d]\n", res);
                defaultIconType = L"Xhigh";
        }
        else
        {
+               fprintf(stderr, "  ## system_info_get_value_int() succeeded. result = [%d]\n", res);
+
                if (width == 480)
                {
                        defaultIconType = L"High";

diff --git a/src/XmlHandler/Parser/ManifestAccountsParser.cpp b/src/XmlHandler/Parser/ManifestAccountsParser.cpp
index cedf7f2..f703141 100755 (executable)
--- a/src/XmlHandler/Parser/ManifestAccountsParser.cpp
+++ b/src/XmlHandler/Parser/ManifestAccountsParser.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <FIoFile.h>
-#include <FSys_SystemInfoImpl.h>
 #include <FBase_StringConverter.h>
 
 #include "ManifestAccountsParser.h"
@@ -32,7 +31,6 @@ using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Base::Utility;
 using namespace Tizen::Io;
-using namespace Tizen::System;
 
 ManifestAccountsParser::ManifestAccountsParser(void)
 :__pContext(null)

diff --git a/src/XmlHandler/Parser/ManifestAppControlsParser.cpp b/src/XmlHandler/Parser/ManifestAppControlsParser.cpp
index 3a7aed5..7462c54 100755 (executable)
--- a/src/XmlHandler/Parser/ManifestAppControlsParser.cpp
+++ b/src/XmlHandler/Parser/ManifestAppControlsParser.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <FIoFile.h>
-#include <FSys_SystemInfoImpl.h>
 #include <FBase_StringConverter.h>
 
 #include "ManifestAppControlsParser.h"
@@ -32,7 +31,6 @@ using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Base::Utility;
 using namespace Tizen::Io;
-using namespace Tizen::System;
 
 ManifestAppControlsParser::ManifestAppControlsParser(void)
 :__pContext(null)

diff --git a/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp b/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
index c3a5f3c..12de63a 100755 (executable)
--- a/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
+++ b/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <FIoFile.h>
-#include <FSys_SystemInfoImpl.h>
 #include <FBase_StringConverter.h>
 
 #include "ManifestLiveboxesParser.h"
@@ -33,7 +32,6 @@ using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Base::Utility;
 using namespace Tizen::Io;
-using namespace Tizen::System;
 
 ManifestLiveboxesParser::ManifestLiveboxesParser(void)
 :__pAppData(null)

diff --git a/src/XmlHandler/Parser/ManifestParser.cpp b/src/XmlHandler/Parser/ManifestParser.cpp
index f7ef9b6..aeb7f01 100755 (executable)
--- a/src/XmlHandler/Parser/ManifestParser.cpp
+++ b/src/XmlHandler/Parser/ManifestParser.cpp
@@ -20,8 +20,6 @@
  */
 
 #include <FIoFile.h>
-#include <FSys_SystemInfoImpl.h>
-#include <FBase_StringConverter.h>
 
 #include "ManifestParser.h"
 #include "InstallerUtil.h"
@@ -30,7 +28,6 @@ using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Base::Utility;
 using namespace Tizen::Io;
-using namespace Tizen::System;
 
 ManifestParser::ManifestParser(void)
 :__pManifestHandler(null)

diff --git a/src/XmlHandler/XmlHandler.cpp b/src/XmlHandler/XmlHandler.cpp
index 5d15ca3..c6222a0 100755 (executable)
--- a/src/XmlHandler/XmlHandler.cpp
+++ b/src/XmlHandler/XmlHandler.cpp
@@ -186,7 +186,7 @@ XmlHandler::Characters(void *ctx, const xmlChar *ch, int len)
        pHandler = (XmlHandler*)ctx;
        char* pCharacters = null;
 
-       if (ch[0] == 0x20 || ch[0] == 0x09 || ch[0] == 0x0D || ch[0] == 0x0A)
+       if (ch[0] == 0x09 || ch[0] == 0x0D || ch[0] == 0x0A)
        {
                return;
        }