Correct DESTROY event list

[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: I8124ac384130f3d754962645905ec715301c86ae

diff --git a/src/client.c b/src/client.c
index f5a00bf..ee10f08 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -187,7 +187,7 @@ static int method_delete(struct dynamicbox_event_arg *arg, void *data)
 
        DbgPrint("pkgname[%s] id[%s]\n", arg->pkgname, arg->id);
 
-       if (arg->info.dbox_destroy.type == DBOX_INSTANCE_DESTROY_DEFAULT || arg->info.dbox_destroy.type == DBOX_INSTANCE_DESTROY_UNINSTALL) {
+       if (arg->info.dbox_destroy.type == DBOX_DESTROY_DEFAULT || arg->info.dbox_destroy.type == DBOX_DESTROY_UNINSTALL) {
                DbgPrint("Box is deleted from the viewer\n");
                (void)dbox_system_event(arg->pkgname, arg->id, DBOX_SYS_EVENT_DELETED);
        }

diff --git a/src/dbox.c b/src/dbox.c
index b29bc65..5e8b923 100644 (file)
--- a/src/dbox.c
+++ b/src/dbox.c
@@ -320,7 +320,7 @@ static inline void do_force_update(struct item *item)
        if (ret <= 0) {
                if (so_need_to_destroy(item->inst) == DBOX_NEED_TO_DESTROY) {
                        dynamicbox_provider_send_deleted(item->inst->item->pkgname, item->inst->id);
-                       dbox_destroy(item->inst->item->pkgname, item->inst->id, DBOX_INSTANCE_DESTROY_DEFAULT);
+                       dbox_destroy(item->inst->item->pkgname, item->inst->id, DBOX_DESTROY_DEFAULT);
                        /*!
                         * \CRITICAL
                         * Every caller of this, must not access the item from now.
@@ -1091,7 +1091,7 @@ static Eina_Bool updator_cb(void *data)
        if (ret <= 0) {
                if (so_need_to_destroy(item->inst) == DBOX_NEED_TO_DESTROY) {
                        dynamicbox_provider_send_deleted(item->inst->item->pkgname, item->inst->id);
-                       dbox_destroy(item->inst->item->pkgname, item->inst->id, DBOX_INSTANCE_DESTROY_DEFAULT);
+                       dbox_destroy(item->inst->item->pkgname, item->inst->id, DBOX_DESTROY_DEFAULT);
                        /*!
                         * \CRITICAL
                         * Every caller of this, must not access the item from now.
@@ -1789,7 +1789,7 @@ HAPI int dbox_destroy(const char *pkgname, const char *id, int type)
        /*
         * To keep the previous status, we should or'ing the value.
         */
-       item->unload_so = (item->unload_so || (type == DBOX_INSTANCE_DESTROY_UNINSTALL));
+       item->unload_so = (item->unload_so || (type == DBOX_DESTROY_UNINSTALL));
 
        if (item->monitor) {
                item->deleteme = 1;