Change xml file to xml.in

Change-Id: I084b8220af67128cea104230c7cb3b9e7525616b

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 4a70181d868995ee22083e87529e06a910aab0cb..a2446b1c1d2858e8171a4bb146e443537d113713 100644 (file)
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,8 +1,9 @@
 SET(MANIFESTDIR "/usr/share/packages")
 
 # manifest
+CONFIGURE_FILE(${PACKAGE_NAME}.xml.in ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.xml)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}.xml DESTINATION ${MANIFESTDIR})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/main_operation.launch DESTINATION /usr/apps/org.tizen.menu-screen/res/data)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.tizen.menu-screen.xml DESTINATION /usr/share/packages)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/${PACKAGE_NAME}.png DESTINATION /usr/apps/org.tizen.menu-screen/shared/res)
 
 ADD_SUBDIRECTORY(edje)

diff --git a/data/org.tizen.menu-screen.xml b/data/org.tizen.menu-screen.xml
deleted file mode 100644 (file)
index 66c6134..0000000
--- a/data/org.tizen.menu-screen.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="@PACKAGE_NAME@" version="1.2.5" install-location="internal-only" api-version="2.3.1">
-       <label>Simple Menu-screen</label>
-       <author email="jinny.yoon@samsung.com" href="www.samsung.com">Jin Yoon</author>
-       <author email="junkyu.han@samsung.com" href="www.samsung.com">Junkyu Han</author>
-       <author email="yjoo93.park@samsung.com" href="www.samsung.com">Youngjoo Park</author>
-       <description>Simple Menu-screen Application</description>
-       <ui-application appid="@PACKAGE_NAME@" exec="@EXEC_PREFIX@/@PROJECT_NAME@" nodisplay="true" multiple="false" type="capp" taskmanage="false">
-               <label>Simple Menu-screen</label>
-               <category name="http://tizen.org/category/homeapp"/>
-               <icon>/usr/share/icons/default/small/org.tizen.menu-screen.png</icon>
-       </ui-application>
-       <privileges>
-               <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
-       </privileges>
-</manifest>

diff --git a/data/org.tizen.menu-screen.xml.in b/data/org.tizen.menu-screen.xml.in
new file mode 100644 (file)
index 0000000..6631dae
--- /dev/null
+++ b/data/org.tizen.menu-screen.xml.in
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://tizen.org/ns/packages" package="@PACKAGE_NAME@" version="1.2.5" install-location="internal-only" api-version="2.3.1">
+       <label>Simple Menu-screen</label>
+       <author email="jinny.yoon@samsung.com" href="www.samsung.com">Jin Yoon</author>
+       <author email="junkyu.han@samsung.com" href="www.samsung.com">Junkyu Han</author>
+       <author email="yjoo93.park@samsung.com" href="www.samsung.com">Youngjoo Park</author>
+       <description>Simple Menu-screen Application</description>
+       <ui-application appid="@PACKAGE_NAME@" exec="@EXEC_PREFIX@/@PROJECT_NAME@" nodisplay="true" multiple="false" type="capp" taskmanage="false">
+               <label>Simple Menu-screen</label>
+               <category name="http://tizen.org/category/homeapp"/>
+               <icon>/usr/share/icons/default/small/org.tizen.menu-screen.png</icon>
+       </ui-application>
+       <privileges>
+               <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+               <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
+       </privileges>
+</manifest>

diff --git a/src/menu_screen.c b/src/menu_screen.c
index a6a65346070c6275e36ac54fc0f4d64392a5fe28..1ffa99721f1d6d56ff109a9a660883243b74f42c 100755 (executable)
--- a/src/menu_screen.c
+++ b/src/menu_screen.c
@@ -235,8 +235,12 @@ static menu_screen_error_e _create_canvas(char *name, char *title)
        if (title) {
                elm_win_title_set(menu_screen_info.win, title);
        }
+       _D("elm_scale: %f", elm_app_base_scale_get());
+       _D("config_scale: %f", elm_config_scale_get());
+
        elm_win_borderless_set(menu_screen_info.win, EINA_TRUE);
        elm_win_screen_size_get(menu_screen_info.win, NULL, NULL, &menu_screen_info.root_width, &menu_screen_info.root_height);
+       _D("menu-screen window size:: width: %d, height: %d", menu_screen_info.root_width, menu_screen_info.root_height);
 
 #if 0
        ecore_x_icccm_name_class_set(elm_win_xwindow_get(menu_screen_info.win), "MENU_SCREEN", "MENU_SCREEN");

diff --git a/src/pkgmgr.c b/src/pkgmgr.c
index d32ca418e64599890f72b3b595c07bc825f3d1e9..f9b681fec02958975f6818bf0ac00e388f246b9e 100644 (file)
--- a/src/pkgmgr.c
+++ b/src/pkgmgr.c
@@ -315,7 +315,7 @@ HAPI inline menu_screen_error_e pkgmgr_uninstall(Evas_Object *item)
        }
 
        _D("Uninstall a package[%s] from an app[%s]", pkgid, appid);
-       if (pkgmgr_client_uninstall(req_pc, NULL, pkgid, PM_QUIET, NULL, NULL) < 0) {
+       if (pkgmgr_client_usr_uninstall(req_pc, NULL, pkgid, PM_QUIET, NULL, NULL, getuid()) < 0) {
                _E("cannot uninstall %s.", item_get_package(item));
                ret = MENU_SCREEN_ERROR_FAIL;
        }