Just let's use the lb_init and lb_fini

Change-Id: I819f9efa7330ae96cc12fd37cbb5237edbed8164

diff --git a/com.samsung.data-provider-slave.desktop b/com.samsung.data-provider-slave.desktop
deleted file mode 100644 (file)
index 81c6312..0000000
--- a/com.samsung.data-provider-slave.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-Name=Live Data Provider - Slave
-Type=Application
-Exec=/usr/apps/com.samsung.data-provider-slave/bin/data-provider-slave
-Icon=com.samsung.data-provider-slave.png
-NoDisplay=True
-Network=True
-Comment=Homescreen-Live Box content data provider (slave)
-X-TIZEN-TaskManage=False
-X-TIZEN-Multiple=True

diff --git a/include/lb.h b/include/lb.h
index 2d753b8..a72ea74 100644 (file)
--- a/include/lb.h
+++ b/include/lb.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-extern int lb_init(void);
-extern int lb_fini(void);
+extern void lb_init(void);
+extern void lb_fini(void);
 
 extern int lb_create(const char *pkgname, const char *id, const char *content_info, int timeout, int has_livebox_script, double period, const char *cluster, const char *category, int *w, int *h, double *priority, int skip_need_to_create, const char *abi, char **out_content, char **out_title);
 extern int lb_destroy(const char *pkgname, const char *id);

diff --git a/src/lb.c b/src/lb.c
index 85a3181..b80edde 100644 (file)
--- a/src/lb.c
+++ b/src/lb.c
@@ -1196,29 +1196,35 @@ static inline int update_monitor_add(const char *id, struct item *item)
        return LB_STATUS_SUCCESS;
 }
 
-HAPI int lb_init(void)
+HAPI void lb_init(void)
 {
-       return LB_STATUS_SUCCESS;
+       return;
 }
 
-HAPI int lb_fini(void)
+HAPI void lb_fini(void)
 {
-       Eina_List *l;
-       Eina_List *n;
-       struct item *item;
+       int ret;
+
+       ret = lb_delete_all_deleteme();
+       if (ret < 0) {
+               DbgPrint("Delete all deleteme: %d\n", ret);
+       }
 
+       ret = lb_delete_all();
+       if (ret < 0) {
+               DbgPrint("Delete all: %d\n", ret);
+       }
+
+       /* Just for in case of ... */
        deactivate_pending_consumer();
        deactivate_pd_open_pending_consumer();
 
-       EINA_LIST_FREE(s_info.pd_open_pending_list, item);
-       EINA_LIST_FREE(s_info.pending_list, item);
-
-       EINA_LIST_FOREACH_SAFE(s_info.item_list, l, n, item) {
-               provider_send_deleted(item->inst->item->pkgname, item->inst->id);
-               lb_destroy(item->inst->item->pkgname, item->inst->id);
-       }
+       eina_list_free(s_info.pd_open_pending_list);
+       s_info.pd_open_pending_list = NULL;
+       eina_list_free(s_info.pending_list);
+       s_info.pending_list = NULL;
 
-       return LB_STATUS_SUCCESS;
+       return;
 }
 
 /*!

diff --git a/src/main.c b/src/main.c
index 3afaac1..4c37329 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -469,6 +469,8 @@ static bool app_create(void *argv)
        font_changed_cb(NULL, NULL);
        font_size_cb(SYSTEM_SETTINGS_KEY_FONT_SIZE, NULL);
 
+       lb_init();
+
        return TRUE;
 }
 
@@ -478,15 +480,7 @@ static void app_terminate(void *data)
 
        DbgPrint("Terminating provider\n");
 
-       ret = lb_delete_all_deleteme();
-       if (ret < 0) {
-               DbgPrint("Delete all deleteme: %d\n", ret);
-       }
-
-       ret = lb_delete_all();
-       if (ret < 0) {
-               DbgPrint("Delete all: %d\n", ret);
-       }
+       lb_fini();
 
        ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_FONT_SIZE);
        if (ret < 0) {