Various patches are applied

[apps/livebox/livebox-viewer.git] / src / livebox.c

diff --git a/src/livebox.c b/src/livebox.c
index 3c0970b..0ceae6f 100644 (file)
--- a/src/livebox.c
+++ b/src/livebox.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013  Samsung Electronics Co., Ltd
  *
- * Licensed under the Flora License, Version 1.0 (the "License");
+ * Licensed under the Flora License, Version 1.1 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
@@ -1367,8 +1367,11 @@ EAPI int livebox_access_event(struct livebox *handler, enum access_event_type ty
        case ACCESS_EVENT_ACTIVATE:
                strcpy(ptr, "_access_activate");
                break;
-       case ACCESS_EVENT_VALUE_CHANGE:
-               strcpy(ptr, "_access_value_change");
+       case ACCESS_EVENT_ACTION_DOWN:
+               strcpy(ptr, "_access_action_down");
+               break;
+       case ACCESS_EVENT_ACTION_UP:
+               strcpy(ptr, "_access_action_up");
                break;
        case ACCESS_EVENT_UNHIGHLIGHT:
                strcpy(ptr, "_access_unhighlight");
@@ -1448,7 +1451,7 @@ EAPI int livebox_content_event(struct livebox *handler, enum content_event_type
                }
                *ptr++ = 'p';
                *ptr++ = 'd';
-       } else {
+       } else if (type & CONTENT_EVENT_LB_MASK) {
                int flag = 1;
 
                if (type & CONTENT_EVENT_MOUSE_MASK) {
@@ -1478,12 +1481,15 @@ EAPI int livebox_content_event(struct livebox *handler, enum content_event_type
                }
                *ptr++ = 'l';
                *ptr++ = 'b';
+       } else {
+               ErrPrint("Invalid event type\n");
+               return LB_STATUS_ERROR_INVALID;
        }
 
        /*!
         * Must be short than 29 bytes.
         */
-       switch ((type & ~CONTENT_EVENT_PD_MASK)) {
+       switch ((type & ~(CONTENT_EVENT_PD_MASK | CONTENT_EVENT_LB_MASK))) {
        case CONTENT_EVENT_MOUSE_ENTER | CONTENT_EVENT_MOUSE_MASK:
                strcpy(ptr, "_mouse_enter");
                break;
@@ -2707,11 +2713,13 @@ int lb_delete_all(void)
 int lb_set_content(struct livebox *handler, const char *content)
 {
        if (handler->content) {
+               DbgPrint("Release content: %s\n", content);
                free(handler->content);
                handler->content = NULL;
        }
 
        if (content) {
+               DbgPrint("Update Content: [%s]\n", content);
                handler->content = strdup(content);
                if (!handler->content) {
                        CRITICAL_LOG("Heap: %s (content: %s)\n", strerror(errno), content);