User can try to release the pixmap in the deleted callback.

but in the deleted callback, the handler has DELETE state.
so the release_pixmap function should not check the states of handler.
We have to believe the user. who has to use the valid handler.

Change-Id: I6460a13f5137e2d99f168e8eabbd32ccb0af1a7d

diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec
index b421cc5..1ea6f66 100644 (file)
--- a/packaging/liblivebox-viewer.spec
+++ b/packaging/liblivebox-viewer.spec
@@ -1,6 +1,6 @@
 Name: liblivebox-viewer
 Summary: Library for developing the application
-Version: 0.20.5
+Version: 0.20.6
 Release: 1
 Group: HomeTF/Livebox
 License: Flora

diff --git a/src/livebox.c b/src/livebox.c
index 44c55b4..344ae1e 100644 (file)
--- a/src/livebox.c
+++ b/src/livebox.c
@@ -3254,16 +3254,24 @@ EAPI int livebox_acquire_lb_pixmap(struct livebox *handler, ret_cb_t cb, void *d
        return lb_acquire_lb_pixmap(handler, cb, data);
 }
 
+/*!
+ * \note
+ * Do not check the state of handler and common-handler.
+ * If this function is used in the deleted callback,
+ * the handler and common-handler's state would be DELETE
+ * if this function check the state of handles,
+ * user cannot release the pixmap.
+ */
 EAPI int livebox_release_lb_pixmap(struct livebox *handler, int pixmap)
 {
        struct packet *packet;
 
-       if (!handler || pixmap == 0 || handler->state != CREATE) {
+       if (!handler || pixmap == 0 /* || handler->state != CREATE */ ) {
                ErrPrint("Handler is invalid [%d]\n", pixmap);
                return LB_STATUS_ERROR_INVALID;
        }
 
-       if (!handler->common || handler->common->state != CREATE) {
+       if (!handler->common /* || handler->common->state != CREATE */) {
                ErrPrint("Handler is invalid\n");
                return LB_STATUS_ERROR_INVALID;
        }
@@ -3380,16 +3388,24 @@ EAPI int livebox_lb_pixmap(const struct livebox *handler)
        return pixmap;
 }
 
+/*!
+ * \note
+ * Do not check the state of handler and common-handler.
+ * If this function is used in the deleted callback,
+ * the handler and common-handler's state would be DELETE
+ * if this function check the state of handles,
+ * user cannot release the pixmap.
+ */
 EAPI int livebox_release_pd_pixmap(struct livebox *handler, int pixmap)
 {
        struct packet *packet;
 
-       if (!handler || pixmap == 0 || handler->state != CREATE) {
+       if (!handler || pixmap == 0 /* || handler->state != CREATE */) {
                ErrPrint("Handler is invalid [%d]\n", pixmap);
                return LB_STATUS_ERROR_INVALID;
        }
 
-       if (!handler->common || handler->common->state != CREATE) {
+       if (!handler->common /* || handler-common->state != CREATE */) {
                ErrPrint("Handler is invalid\n");
                return LB_STATUS_ERROR_INVALID;
        }