Fix permanent exit logic

[platform/core/appfw/appcore-widget.git] / src / base / widget_base.c

diff --git a/src/base/widget_base.c b/src/base/widget_base.c
index e43635d..2d7d29c 100644 (file)
--- a/src/base/widget_base.c
+++ b/src/base/widget_base.c
@@ -20,6 +20,7 @@
 #include <bundle.h>
 #include <bundle_internal.h>
 #include <aul.h>
+#include <aul_widget.h>
 #include <dlog.h>
 #include <glib.h>
 #include <glib-object.h>
@@ -28,7 +29,7 @@
 #include <widget_errno.h>
 #include <widget_instance.h>
 #include <aul_app_com.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 #include <system_info.h>
 #include <vconf.h>
 #include <vconf-internal-keys.h>
@@ -111,6 +112,12 @@ static gboolean __timeout_cb(gpointer user_data)
        const char *class_id;
 
        cxt = appcore_multiwindow_base_instance_find(data->id);
+
+       if (!cxt) {
+               LOGE("Can't find the instance");
+               return G_SOURCE_REMOVE;
+       }
+
        if (appcore_multiwindow_base_instance_is_resumed(cxt)) {
                LOGD("Periodic update!");
                class_id = appcore_multiwindow_base_instance_get_class_id(cxt);
@@ -769,9 +776,14 @@ static void __multiwindow_exit(void *data)
 
 EXPORT_API int widget_base_exit(void)
 {
+       int ret;
+
        appcore_multiwindow_base_exit();
-       if (appcore_multiwindow_base_instance_get_cnt() != 0 && __is_permanent)
-               aul_notify_exit();
+       if (appcore_multiwindow_base_instance_get_cnt() == 0 && __is_permanent) {
+               ret = aul_notify_exit();
+               aul_widget_write_log(LOG_TAG, "[%s:%d] permanent exit : %d",
+                       __FUNCTION__, __LINE__, ret);
+       }
 
        return 0;
 }
@@ -1249,19 +1261,18 @@ static void __free_class(gpointer data)
 
 EXPORT_API void widget_base_fini(void)
 {
+       appcore_multiwindow_base_fini();
        g_list_free_full(__context.classes, __free_class);
        __context.classes = NULL;
-
-       appcore_multiwindow_base_fini();
 }
 
 EXPORT_API int widget_base_context_window_bind(
                widget_base_instance_h instance_h, const char *id,
-               Ecore_Wl_Window *wl_win)
+               Ecore_Wl2_Window *wl_win)
 {
        struct wl_surface *surface;
 
-       surface = ecore_wl_window_surface_get(wl_win);
+       surface = ecore_wl2_window_surface_get(wl_win);
        if (surface == NULL) {
                LOGE("failed to get surface"); /* LCOV_EXCL_LINE */
                return WIDGET_BASE_ERROR_FAULT; /* LCOV_EXCL_LINE */
@@ -1388,7 +1399,8 @@ static void __multiwindow_instance_create(
 
                ret = bundle_get_byte(b, WIDGET_K_PERIOD, (void **)&period,
                                &size);
-               if (ret == BUNDLE_ERROR_NONE) {
+               if (ret == BUNDLE_ERROR_NONE && *period > 0) {
+                       LOGI("set periodic update timer (%lf)", *period);
                        instance_data->period = *period;
                        instance_data->periodic_timer = g_timeout_add_seconds(
                                        instance_data->period,
@@ -1442,11 +1454,7 @@ static void __multiwindow_instance_resume(
 
        if (!__fg_signal) {
                LOGD("Send fg signal to resourceD");
-               aul_send_app_status_change_signal(getpid(),
-                               __appid,
-                               __package_id,
-                               STATUS_FOREGROUND,
-                               APP_TYPE_WIDGET);
+               aul_widget_instance_change_status(class_id, STATUS_FOREGROUND);
                __fg_signal = true;
        }
 }
@@ -1477,11 +1485,7 @@ static void __multiwindow_instance_pause(
 
        if (__fg_signal) {
                LOGD("Send bg signal to resourceD");
-               aul_send_app_status_change_signal(getpid(),
-                               __appid,
-                               __package_id,
-                               STATUS_BACKGROUND,
-                               APP_TYPE_WIDGET);
+               aul_widget_instance_change_status(class_id, STATUS_BACKGROUND);
                __fg_signal = false;
        }
 }
@@ -1526,7 +1530,7 @@ static void __multiwindow_instance_terminate(
        if (cls->ops.destroy)
                cls->ops.destroy(instance_h, reason, content_info, class_data);
 
-       LOGD("%s is destroyed %d", id, reason);
+       LOGW("%s is destroyed %d", id, reason);
        if (reason == WIDGET_BASE_DESTROY_TYPE_PERMANENT) {
                __is_permanent = true;
                event = WIDGET_INSTANCE_EVENT_DESTROY;
@@ -1600,6 +1604,7 @@ EXPORT_API widget_base_class widget_base_class_get_default(void)
        cls.ops.destroy = __class_on_destroy;
        cls.ops.pause = __class_on_pause;
        cls.ops.resume = __class_on_resume;
+       cls.id = NULL;
 
        return cls;
 }