1. add smack manifest

2. changed domain name in smack manifest file
3. Changed API parameter : pkg_name => appid

diff --git a/app-svc.manifest b/app-svc.manifest
new file mode 100644 (file)
index 0000000..e8f9198
--- /dev/null
+++ b/app-svc.manifest
@@ -0,0 +1,15 @@
+<manifest>
+       <define>
+               <domain name="app-svc"/>
+               <provide>
+                       <label name="app-svc::db"/>
+               </provide>
+       </define>
+       <request>
+               <domain name="app-svc"/>
+       </request>
+       <assign>
+               <filesystem path="/usr/lib/libappsvc.so.0" label="_"/>
+               <filesystem path="/usr/lib/libappsvc.so.0.1.0" label="_"/>
+       </assign>
+</manifest>

diff --git a/include/appsvc.h b/include/appsvc.h
index ccf5c6c..f70077d 100755 (executable)
--- a/include/appsvc.h
+++ b/include/appsvc.h
@@ -140,7 +140,7 @@ typedef void (*appsvc_res_fn)(bundle *b, int request_code, appsvc_result_val res
  * @param[out] pkg_name        package name retreived by appsvc_get_list
  * @param[out] data            user-supplied data      
 */
-typedef int (*appsvc_info_iter_fn)(const char *pkg_name, void *data);
+typedef int (*appsvc_info_iter_fn)(const char *appid, void *data);
 
 typedef int (*appsvc_host_res_fn)(void *data);
 
@@ -351,7 +351,8 @@ int appsvc_add_data_array(bundle *b, const char *key, const char **val_array, in
  * @endcode
  *
  */
-int appsvc_set_pkgname(bundle *b, const char *pkg_name);
+/* Deprecated API */
+int appsvc_set_pkgname(bundle *b, const char *pkg_name); // __attribute__((deprecated));
 
 
 /**
@@ -586,7 +587,8 @@ const char *appsvc_get_mime(bundle *b);
  * @endcode
  *
  */
-const char *appsvc_get_pkgname(bundle *b);
+/* Deprecated API */
+const char *appsvc_get_pkgname(bundle *b); // __attribute__((deprecated));
 
 /**
  * @par Description:
@@ -835,7 +837,7 @@ int appsvc_unset_defapp(const char *defapp);
  *     None
 * 
 */
-int appsvc_is_defapp(const char *pkg_name);
+int appsvc_is_defapp(const char *appid);
 
 
 /**

diff --git a/packaging/app-svc.spec b/packaging/app-svc.spec
index 1b7a9b7..2e930fe 100644 (file)
--- a/packaging/app-svc.spec
+++ b/packaging/app-svc.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/pkgs/a/app-svc app-svc 0.1.19 de68cdc468eaded317b4f5be9cdafebb01639aa0
 Name:      app-svc
 Summary:    App svc
-Version: 0.1.27
+Version: 0.1.33
 Release:    1
 Group:      System/Libraries
 License:    Apache License, Version 2.0
@@ -62,10 +62,13 @@ chown 0:5000 /opt/dbspace/.appsvc.db
 chown 0:5000 /opt/dbspace/.appsvc.db-journal
 chmod 664 /opt/dbspace/.appsvc.db
 chmod 664 /opt/dbspace/.appsvc.db-journal
+chsmack -a 'app-svc::db' opt/dbspace/.appsvc.db
+chsmack -a 'app-svc::db' opt/dbspace/.appsvc.db-journal
 
 %postun -p /sbin/ldconfig
 
 %files
+%manifest app-svc.manifest
 %defattr(-,root,root,-)
 /opt/share/appsvc_db.sql
 /usr/bin/appsvc_test

diff --git a/src/appsvc.c b/src/appsvc.c
index f76f38f..69cbd92 100755 (executable)
--- a/src/appsvc.c
+++ b/src/appsvc.c
@@ -485,7 +485,7 @@ SLPAPI int appsvc_run_service(bundle *b, int request_code, appsvc_res_fn cbfunc,
                return ret;
 
        pkgname = info.pkgname;
-       _D("op - %s / mime - %s / shceme - %s\n", info.op, info.mime, info.scheme);
+       _D("op - %s / mime - %s / shceme - %s\n", info.op, info.origin_mime, info.scheme);
 
        /* explict*/
        if(pkgname) {
@@ -497,7 +497,7 @@ SLPAPI int appsvc_run_service(bundle *b, int request_code, appsvc_res_fn cbfunc,
        }
 
        if(info.uri_r_info) {
-               pkgname = _svc_db_get_app(info.op, info.mime, info.uri_r_info);
+               pkgname = _svc_db_get_app(info.op, info.origin_mime, info.uri_r_info);
 
                if(pkgname==NULL){
                        __get_list_with_condition_mime_extened(info.op, info.uri_r_info,
@@ -534,7 +534,7 @@ SLPAPI int appsvc_run_service(bundle *b, int request_code, appsvc_res_fn cbfunc,
                }
        }
        
-       pkgname = _svc_db_get_app(info.op, info.mime, info.scheme);
+       pkgname = _svc_db_get_app(info.op, info.origin_mime, info.scheme);
 
        if(pkgname==NULL){
                __get_list_with_condition_mime_extened(info.op, info.scheme,