Apply AppFW requests.

[model] Redwood,Kiran,B3(Wearable)
[binary_type] AP
[customer] Docomo/Orange/ATT/Open
[issue#] N/A
[problem]
[cause]
[solution]
[team] HomeTF
[request]
[horizontal_expansion]

Change-Id: Ia5e046aed1cdaedc4dba0aca004bce2bd1acb9b8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 717cc4b..926a63f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,6 @@ pkg_check_modules(pkgs REQUIRED
        com-core
        sqlite3
        db-util
-       pkgmgr
        pkgmgr-info
        vconf
        icu-uc

diff --git a/packaging/libwidget_service.spec b/packaging/libwidget_service.spec
index 61260e5..16b4e84 100644 (file)
--- a/packaging/libwidget_service.spec
+++ b/packaging/libwidget_service.spec
@@ -16,7 +16,6 @@ BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(com-core)
 BuildRequires: pkgconfig(sqlite3)
 BuildRequires: pkgconfig(db-util)
-BuildRequires: pkgconfig(pkgmgr)
 BuildRequires: pkgconfig(pkgmgr-info)
 BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(icu-uc)

diff --git a/src/widget_service.c b/src/widget_service.c
index e3b45e1..300cf84 100644 (file)
--- a/src/widget_service.c
+++ b/src/widget_service.c
@@ -29,7 +29,6 @@
 #include <packet.h>
 #include <dlog.h>
 #include <db-util.h>
-#include <package-manager.h>
 #include <pkgmgr-info.h>
 #include <vconf.h>
 #include <vconf-keys.h>
@@ -262,7 +261,7 @@ static inline int pkgmgr_get_applist(const char *pkgid, const char *widgetid, vo
        cbdata.cb = cb;
        cbdata.cbdata = data;
 
-       ret = pkgmgrinfo_appinfo_get_list(handle, PM_UI_APP, pkgmgr_cb, &cbdata);
+       ret = pkgmgrinfo_appinfo_get_list(handle, PMINFO_UI_APP, pkgmgr_cb, &cbdata);
        if (ret < 0) {
                ErrPrint("Failed to get applist\n");
        }
@@ -2459,14 +2458,14 @@ EAPI char *widget_service_get_widget_id(const char *appid)
         * Try to get the package id using given appid
         */
        ret = pkgmgrinfo_appinfo_get_appinfo(appid, &handle);
-       if (ret != PKGMGR_R_OK) {
+       if (ret != PMINFO_R_OK) {
                set_last_result(WIDGET_ERROR_FAULT);
                ErrPrint("Failed to get appinfo\n");
                return NULL;
        }
 
        ret = pkgmgrinfo_appinfo_get_pkgid(handle, &new_appid);
-       if (ret != PKGMGR_R_OK) {
+       if (ret != PMINFO_R_OK) {
                set_last_result(WIDGET_ERROR_FAULT);
                pkgmgrinfo_appinfo_destroy_appinfo(handle);
                ErrPrint("Failed to get pkgname for (%s)\n", appid);
@@ -2547,14 +2546,14 @@ EAPI char *widget_service_get_package_id(const char *pkgname)
                sqlite3_finalize(stmt);
 
                ret = pkgmgrinfo_appinfo_get_appinfo(pkgname, &pkg_handle);
-               if (ret != PKGMGR_R_OK) {
+               if (ret != PMINFO_R_OK) {
                        set_last_result(WIDGET_ERROR_FAULT);
                        ErrPrint("Failed to get appinfo: %s\n", pkgname);
                        goto out;
                }
 
                ret = pkgmgrinfo_appinfo_get_pkgid(pkg_handle, &new_appid);
-               if (ret != PKGMGR_R_OK) {
+               if (ret != PMINFO_R_OK) {
                        set_last_result(WIDGET_ERROR_FAULT);
                        ErrPrint("Failed to get pkgname for (%s)\n", appid);
                        pkgmgrinfo_appinfo_destroy_appinfo(pkg_handle);