Merge "Add request type and codes for set app label" into tizen_3.0

diff --git a/src/pkgmgr-server.c b/src/pkgmgr-server.c
index 04a80ca..fbe5424 100644 (file)
--- a/src/pkgmgr-server.c
+++ b/src/pkgmgr-server.c
@@ -572,24 +572,15 @@ static int __change_job_info(struct backend_job *job, uid_t uid,
        int ret = 0;
        char *pkgid = NULL;
        pkgmgrinfo_appinfo_h handle = NULL;
-
-       switch (job->req_type) {
-       case REQUEST_TYPE_DISABLE_APP:
-       case REQUEST_TYPE_DISABLE_GLOBAL_APP_FOR_UID:
-       case REQUEST_TYPE_ENABLE_APP_SPLASH_SCREEN:
-       case REQUEST_TYPE_DISABLE_APP_SPLASH_SCREEN:
-               ret = pkgmgrinfo_appinfo_get_usr_appinfo(job->pkgid, uid,
-                               &handle);
-               break;
-       case REQUEST_TYPE_ENABLE_APP:
-       case REQUEST_TYPE_ENABLE_GLOBAL_APP_FOR_UID:
-               ret = pkgmgrinfo_appinfo_get_usr_disabled_appinfo(job->pkgid,
-                               uid, &handle);
-               break;
-       default:
+       if (job->req_type != REQUEST_TYPE_DISABLE_APP &&
+                       job->req_type != REQUEST_TYPE_DISABLE_GLOBAL_APP_FOR_UID &&
+                       job->req_type != REQUEST_TYPE_ENABLE_APP_SPLASH_SCREEN &&
+                       job->req_type != REQUEST_TYPE_DISABLE_APP_SPLASH_SCREEN &&
+                       job->req_type != REQUEST_TYPE_ENABLE_APP &&
+                       job->req_type != REQUEST_TYPE_ENABLE_GLOBAL_APP_FOR_UID)
                return PMINFO_R_ERROR;
-       }
 
+       ret = pkgmgrinfo_appinfo_get_usr_all_appinfo(job->pkgid, uid, &handle);
        if (ret != PMINFO_R_OK)
                return PMINFO_R_ERROR;
 

diff --git a/src/util.c b/src/util.c
index 6b683fd..6a1b7b9 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -51,13 +51,9 @@ char *_get_pkgtype_from_pkgid(const char *pkgid, uid_t uid)
        pkgmgrinfo_pkginfo_h info;
        int ret;
 
-       ret = pkgmgrinfo_pkginfo_get_usr_pkginfo(pkgid, uid, &info);
-       if (ret != PMINFO_R_OK) {
-               ret = pkgmgrinfo_pkginfo_get_usr_disabled_pkginfo(pkgid, uid,
-                               &info);
-               if (ret != PMINFO_R_OK)
-                       return NULL;
-       }
+       ret = pkgmgrinfo_pkginfo_get_usr_all_pkginfo(pkgid, uid, &info);
+       if (ret != PMINFO_R_OK)
+               return NULL;
 
        ret = pkgmgrinfo_pkginfo_get_type(info, &pkgtype);
        if (ret != PMINFO_R_OK) {