summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSung-jae Park <nicesj.park@samsung.com>2013-04-30 12:48:11 (GMT)
committerSung-jae Park <nicesj.park@samsung.com>2013-05-02 05:27:36 (GMT)
commitd79e96dcadca13b8c4ec97351662857d5f254999 (patch)
tree5ef9d1828c721e2c437572ec1f8b32544f3b5c53
parent326017e6f984ffcf30a5ee86f6d9e27f506b1bce (diff)
downloadlivebox-viewer-tizen_2.1.zip
livebox-viewer-tizen_2.1.tar.gz
livebox-viewer-tizen_2.1.tar.bz2
Patch 8/8 Fix the invalid livebox content event handling code. (After changing the event mask, viewer cannot send livebox event correctly.) Patch 7/8 Fix the prevent issue Patch 6/8 Update License Patch 5/8 Replace VALUE_CHANGE with ACTION_DOWN/UP Patch 4/8 Resolve prevent issues Patch 3/8 Update version Patch 2/8 Fix prevent issue: CID 16045 Patch 1/8 Use the vconf instead of timer. To optimize the initiate method. While using timer, the library tries to make a connection to a master every N sec later. But it decrease the system performance, so I just changed the timer to the vconf notification. Now the viewer will only tries to connect to the master only if its state is changed. But in the worst case, If the master is started, but the viewer fails to connect to a master, The viewer will not try to connect to the master again. Even if the master is ready to accept a new connection. (If we met this case, the system has serious problems.) Change-Id: Ibe8adfb00dcc2695e366d6cacdce05cb74bc161c
-rw-r--r--LICENSE26
-rw-r--r--include/client.h2
-rw-r--r--include/conf.h2
-rw-r--r--include/critical_log.h2
-rw-r--r--include/debug.h2
-rw-r--r--include/desc_parser.h2
-rw-r--r--include/dlist.h2
-rw-r--r--include/fb.h2
-rw-r--r--include/livebox-viewer_PG.h2
-rw-r--r--include/livebox.h29
-rw-r--r--include/livebox_internal.h2
-rw-r--r--include/master_rpc.h2
-rw-r--r--include/util.h2
-rw-r--r--live.viewer/include/debug.h2
-rw-r--r--live.viewer/include/dlist.h2
-rw-r--r--live.viewer/include/lb.h2
-rw-r--r--live.viewer/include/live_scroller.h2
-rw-r--r--live.viewer/include/main.h2
-rw-r--r--live.viewer/include/scroller.h2
-rw-r--r--live.viewer/include/util.h2
-rw-r--r--live.viewer/res/live-viewer.edc2
-rw-r--r--live.viewer/src/dlist.c2
-rw-r--r--live.viewer/src/lb.c2
-rw-r--r--live.viewer/src/live_scroller.c2
-rw-r--r--live.viewer/src/main.c2
-rw-r--r--live.viewer/src/scroller.c2
-rw-r--r--live.viewer/src/util.c2
-rw-r--r--packaging/liblivebox-viewer.spec2
-rw-r--r--src/client.c2
-rw-r--r--src/critical_log.c2
-rw-r--r--src/desc_parser.c2
-rw-r--r--src/dlist.c2
-rw-r--r--src/fb.c2
-rw-r--r--src/livebox.c18
-rw-r--r--src/master_rpc.c2
-rw-r--r--src/util.c2
36 files changed, 75 insertions, 64 deletions
diff --git a/LICENSE b/LICENSE
index fd90a36..571fe79 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
Flora License
-Version 1.0, April, 2013
+Version 1.1, April, 2013
http://floralicense.org/license/
@@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions:
Derivative Works; or, within a display generated by the Derivative Works,
if and wherever such third-party notices normally appear.
The contents of the NOTICE file are for informational purposes only
- and do not modify the License.
-
-You may add Your own attribution notices within Derivative Works
-that You distribute, alongside or as an addendum to the NOTICE text
-from the Work, provided that such additional attribution notices
-cannot be construed as modifying the License. You may add Your own
-copyright statement to Your modifications and may provide additional or
-different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works
-as a whole, provided Your use, reproduction, and distribution of
-the Work otherwise complies with the conditions stated in this License.
+ and do not modify the License. You may add Your own attribution notices
+ within Derivative Works that You distribute, alongside or as an addendum
+ to the NOTICE text from the Work, provided that such additional attribution
+ notices cannot be construed as modifying the License. You may add Your own
+ copyright statement to Your modifications and may provide additional or
+ different license terms and conditions for use, reproduction, or
+ distribution of Your modifications, or for any such Derivative Works
+ as a whole, provided Your use, reproduction, and distribution of
+ the Work otherwise complies with the conditions stated in this License
+ and your own copyright statement or terms and conditions do not conflict
+ the conditions stated in the License including section 3.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
@@ -192,7 +192,7 @@ identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
- 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
diff --git a/include/client.h b/include/client.h
index dfa991e..e0348d4 100644
--- a/include/client.h
+++ b/include/client.h
@@ -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
*
diff --git a/include/conf.h b/include/conf.h
index 0070626..4f50bfe 100644
--- a/include/conf.h
+++ b/include/conf.h
@@ -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
*
diff --git a/include/critical_log.h b/include/critical_log.h
index 4628e62..4c6c23c 100644
--- a/include/critical_log.h
+++ b/include/critical_log.h
@@ -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
*
diff --git a/include/debug.h b/include/debug.h
index 8b6139e..cc2e49b 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -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
*
diff --git a/include/desc_parser.h b/include/desc_parser.h
index 1a48a9f..0ba13ef 100644
--- a/include/desc_parser.h
+++ b/include/desc_parser.h
@@ -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
*
diff --git a/include/dlist.h b/include/dlist.h
index 99e8443..cd1a421 100644
--- a/include/dlist.h
+++ b/include/dlist.h
@@ -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
*
diff --git a/include/fb.h b/include/fb.h
index 8aef35f..757bdfe 100644
--- a/include/fb.h
+++ b/include/fb.h
@@ -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
*
diff --git a/include/livebox-viewer_PG.h b/include/livebox-viewer_PG.h
index 94fb941..67a71d8 100644
--- a/include/livebox-viewer_PG.h
+++ b/include/livebox-viewer_PG.h
@@ -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
*
diff --git a/include/livebox.h b/include/livebox.h
index 57ca6b8..afb7c5e 100644
--- a/include/livebox.h
+++ b/include/livebox.h
@@ -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
*
@@ -49,7 +49,7 @@ enum content_event_type {
CONTENT_EVENT_KEY_MASK = 0x80000000,
CONTENT_EVENT_MOUSE_MASK = 0x20000000,
CONTENT_EVENT_PD_MASK = 0x10000000,
- CONTENT_EVENT_LB_MASK = 0x00000000,
+ CONTENT_EVENT_LB_MASK = 0x40000000,
LB_MOUSE_DOWN = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_DOWN,
LB_MOUSE_UP = CONTENT_EVENT_LB_MASK | CONTENT_EVENT_MOUSE_MASK | CONTENT_EVENT_MOUSE_UP,
@@ -78,24 +78,26 @@ enum content_event_type {
enum access_event_type {
ACCESS_EVENT_PD_MASK = 0x10000000,
- ACCESS_EVENT_LB_MASK = 0x00000000,
+ ACCESS_EVENT_LB_MASK = 0x20000000,
ACCESS_EVENT_HIGHLIGHT = 0x00000100, /*!< LB accessibility: Hightlight a object */
ACCESS_EVENT_HIGHLIGHT_NEXT = 0x00000200, /*!< LB accessibility: Set highlight to next object */
ACCESS_EVENT_HIGHLIGHT_PREV = 0x00000400, /*!< LB accessibility: Set highlight to prev object */
- ACCESS_EVENT_ACTIVATE = 0x00000800, /*!< LB accessibility activate */
- ACCESS_EVENT_VALUE_CHANGE = 0x00001000, /*!< LB accessibility value changed */
- ACCESS_EVENT_UNHIGHLIGHT = 0x00002000, /*!< LB accessibility unhighlight */
- ACCESS_EVENT_SCROLL_DOWN = 0x00004000, /*!< LB accessibility scroll down */
- ACCESS_EVENT_SCROLL_MOVE = 0x00008000, /*!< LB accessibility scroll move */
- ACCESS_EVENT_SCROLL_UP = 0x00010000, /*!< LB accessibility scroll up */
+ ACCESS_EVENT_UNHIGHLIGHT = 0x00000800, /*!< LB accessibility unhighlight */
+ ACCESS_EVENT_ACTIVATE = 0x00001000, /*!< LB accessibility activate */
+ ACCESS_EVENT_ACTION_DOWN = 0x00010000, /*!< LB accessibility value changed */
+ ACCESS_EVENT_ACTION_UP = 0x00020000, /*!< LB accessibility value changed */
+ ACCESS_EVENT_SCROLL_DOWN = 0x00100000, /*!< LB accessibility scroll down */
+ ACCESS_EVENT_SCROLL_MOVE = 0x00200000, /*!< LB accessibility scroll move */
+ ACCESS_EVENT_SCROLL_UP = 0x00400000, /*!< LB accessibility scroll up */
LB_ACCESS_HIGHLIGHT = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_HIGHLIGHT,
LB_ACCESS_HIGHLIGHT_NEXT = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_HIGHLIGHT_NEXT,
LB_ACCESS_HIGHLIGHT_PREV = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_HIGHLIGHT_PREV,
- LB_ACCESS_ACTIVATE = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_ACTIVATE,
- LB_ACCESS_VALUE_CHANGE = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_VALUE_CHANGE,
LB_ACCESS_UNHIGHLIGHT = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_UNHIGHLIGHT,
+ LB_ACCESS_ACTIVATE = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_ACTIVATE,
+ LB_ACCESS_ACTION_DOWN = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_ACTION_DOWN,
+ LB_ACCESS_ACTION_UP = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_ACTION_UP,
LB_ACCESS_SCROLL_DOWN = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_SCROLL_DOWN,
LB_ACCESS_SCROLL_MOVE = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_SCROLL_MOVE,
LB_ACCESS_SCROLL_UP = ACCESS_EVENT_LB_MASK | ACCESS_EVENT_SCROLL_UP,
@@ -103,9 +105,10 @@ enum access_event_type {
PD_ACCESS_HIGHLIGHT = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_HIGHLIGHT,
PD_ACCESS_HIGHLIGHT_NEXT = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_HIGHLIGHT_NEXT,
PD_ACCESS_HIGHLIGHT_PREV = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_HIGHLIGHT_PREV,
- PD_ACCESS_ACTIVATE = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_ACTIVATE,
- PD_ACCESS_VALUE_CHANGE = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_VALUE_CHANGE,
PD_ACCESS_UNHIGHLIGHT = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_UNHIGHLIGHT,
+ PD_ACCESS_ACTIVATE = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_ACTIVATE,
+ PD_ACCESS_ACTION_DOWN = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_ACTION_DOWN,
+ PD_ACCESS_ACTION_UP = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_ACTION_UP,
PD_ACCESS_SCROLL_DOWN = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_DOWN,
PD_ACCESS_SCROLL_MOVE = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_MOVE,
PD_ACCESS_SCROLL_UP = ACCESS_EVENT_PD_MASK | ACCESS_EVENT_SCROLL_UP,
diff --git a/include/livebox_internal.h b/include/livebox_internal.h
index 5f6427d..283a59b 100644
--- a/include/livebox_internal.h
+++ b/include/livebox_internal.h
@@ -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
*
diff --git a/include/master_rpc.h b/include/master_rpc.h
index 4304120..d850bfd 100644
--- a/include/master_rpc.h
+++ b/include/master_rpc.h
@@ -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
*
diff --git a/include/util.h b/include/util.h
index 6faff58..b66b542 100644
--- a/include/util.h
+++ b/include/util.h
@@ -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
*
diff --git a/live.viewer/include/debug.h b/live.viewer/include/debug.h
index 8b6139e..cc2e49b 100644
--- a/live.viewer/include/debug.h
+++ b/live.viewer/include/debug.h
@@ -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
*
diff --git a/live.viewer/include/dlist.h b/live.viewer/include/dlist.h
index 99e8443..cd1a421 100644
--- a/live.viewer/include/dlist.h
+++ b/live.viewer/include/dlist.h
@@ -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
*
diff --git a/live.viewer/include/lb.h b/live.viewer/include/lb.h
index ba10c7e..37c48ac 100644
--- a/live.viewer/include/lb.h
+++ b/live.viewer/include/lb.h
@@ -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
*
diff --git a/live.viewer/include/live_scroller.h b/live.viewer/include/live_scroller.h
index bb2728c..02b2450 100644
--- a/live.viewer/include/live_scroller.h
+++ b/live.viewer/include/live_scroller.h
@@ -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
*
diff --git a/live.viewer/include/main.h b/live.viewer/include/main.h
index 7e65d9d..3c142be 100644
--- a/live.viewer/include/main.h
+++ b/live.viewer/include/main.h
@@ -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
*
diff --git a/live.viewer/include/scroller.h b/live.viewer/include/scroller.h
index 1edab1f..f69575f 100644
--- a/live.viewer/include/scroller.h
+++ b/live.viewer/include/scroller.h
@@ -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
*
diff --git a/live.viewer/include/util.h b/live.viewer/include/util.h
index 647ef05..79ab46b 100644
--- a/live.viewer/include/util.h
+++ b/live.viewer/include/util.h
@@ -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
*
diff --git a/live.viewer/res/live-viewer.edc b/live.viewer/res/live-viewer.edc
index abed575..fac023d 100644
--- a/live.viewer/res/live-viewer.edc
+++ b/live.viewer/res/live-viewer.edc
@@ -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
*
diff --git a/live.viewer/src/dlist.c b/live.viewer/src/dlist.c
index cf2cb63..fa3082a 100644
--- a/live.viewer/src/dlist.c
+++ b/live.viewer/src/dlist.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
*
diff --git a/live.viewer/src/lb.c b/live.viewer/src/lb.c
index 5c5d88a..9870b4a 100644
--- a/live.viewer/src/lb.c
+++ b/live.viewer/src/lb.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
*
diff --git a/live.viewer/src/live_scroller.c b/live.viewer/src/live_scroller.c
index bf7f64d..2b88939 100644
--- a/live.viewer/src/live_scroller.c
+++ b/live.viewer/src/live_scroller.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
*
diff --git a/live.viewer/src/main.c b/live.viewer/src/main.c
index 0955215..9f84418 100644
--- a/live.viewer/src/main.c
+++ b/live.viewer/src/main.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
*
diff --git a/live.viewer/src/scroller.c b/live.viewer/src/scroller.c
index 4d08158..7a181fc 100644
--- a/live.viewer/src/scroller.c
+++ b/live.viewer/src/scroller.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
*
diff --git a/live.viewer/src/util.c b/live.viewer/src/util.c
index d3d08e8..8a1c5cb 100644
--- a/live.viewer/src/util.c
+++ b/live.viewer/src/util.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
*
diff --git a/packaging/liblivebox-viewer.spec b/packaging/liblivebox-viewer.spec
index 6443bdd..167b453 100644
--- 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.13.0
+Version: 0.13.1
Release: 1
Group: HomeTF/Livebox
License: Flora License
diff --git a/src/client.c b/src/client.c
index e4322bc..76a91b1 100644
--- a/src/client.c
+++ b/src/client.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
*
diff --git a/src/critical_log.c b/src/critical_log.c
index f99996d..02af5ac 100644
--- a/src/critical_log.c
+++ b/src/critical_log.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
*
diff --git a/src/desc_parser.c b/src/desc_parser.c
index 2079ccf..d76ac8d 100644
--- a/src/desc_parser.c
+++ b/src/desc_parser.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
*
diff --git a/src/dlist.c b/src/dlist.c
index cf2cb63..fa3082a 100644
--- a/src/dlist.c
+++ b/src/dlist.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
*
diff --git a/src/fb.c b/src/fb.c
index 10b90d9..b1d3bba 100644
--- a/src/fb.c
+++ b/src/fb.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
*
diff --git a/src/livebox.c b/src/livebox.c
index 3c0970b..0ceae6f 100644
--- 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);
diff --git a/src/master_rpc.c b/src/master_rpc.c
index ede80aa..984ec1a 100644
--- a/src/master_rpc.c
+++ b/src/master_rpc.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
*
diff --git a/src/util.c b/src/util.c
index a99e85b..48110ce 100644
--- a/src/util.c
+++ b/src/util.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
*