Various patches are applied

Patch 4/4
    Update License

Patch 3/4
    Update the accessibility return value.

Patch 2/4
    Error should be negative value.

Patch 1/4
    Replace VALUE_CHANGE with ACTION
    ACTION_UP/ACTION_DOWN

Change-Id: I8b27cf8cfcc771906460bdf8cc8936051a754bd8

diff --git a/LICENSE b/LICENSE
index fd90a36..571fe79 100644 (file)
--- 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/debug.h b/include/debug.h
index 8b6139e..cc2e49b 100644 (file)
--- 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/dlist.h b/include/dlist.h
index 99e8443..cd1a421 100644 (file)
--- 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/livebox-errno.h b/include/livebox-errno.h
index 3e72b09..592037d 100644 (file)
--- a/include/livebox-errno.h
+++ b/include/livebox-errno.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-service.h b/include/livebox-service.h
index dcb9923..a544d99 100644 (file)
--- a/include/livebox-service.h
+++ b/include/livebox-service.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 livebox_script_event {
        LB_SCRIPT_ACCESS_HIGHLIGHT_NEXT = LB_SCRIPT_ACCESS_EVENT | 0x00000002,
        LB_SCRIPT_ACCESS_HIGHLIGHT_PREV = LB_SCRIPT_ACCESS_EVENT | 0x00000004,
        LB_SCRIPT_ACCESS_ACTIVATE       = LB_SCRIPT_ACCESS_EVENT | 0x00000008,
-       LB_SCRIPT_ACCESS_VALUE_CHANGE   = LB_SCRIPT_ACCESS_EVENT | 0x00000010,
+       LB_SCRIPT_ACCESS_ACTION         = LB_SCRIPT_ACCESS_EVENT | 0x00000010,
        LB_SCRIPT_ACCESS_SCROLL         = LB_SCRIPT_ACCESS_EVENT | 0x00000020,
        LB_SCRIPT_ACCESS_UNHIGHLIGHT    = LB_SCRIPT_ACCESS_EVENT | 0x00000040,
 
@@ -64,11 +64,11 @@ enum livebox_script_event {
 };
 
 enum livebox_access_status {
-       LB_ACCESS_STATUS_DONE,
+       LB_ACCESS_STATUS_ERROR = 0x80000000,
+       LB_ACCESS_STATUS_DONE = 0x00000000,
        LB_ACCESS_STATUS_FIRST, /*!< Reach to the first item */
        LB_ACCESS_STATUS_LAST, /*!< Reach to the last item */
        LB_ACCESS_STATUS_READ, /* TTS done */
-       LB_ACCESS_STATUS_ERROR,
 };
 
 /*!

diff --git a/include/livebox-service_PG.h b/include/livebox-service_PG.h
index 94fb941..67a71d8 100644 (file)
--- a/include/livebox-service_PG.h
+++ b/include/livebox-service_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/util.h b/include/util.h
index e265b1a..6ffc798 100644 (file)
--- 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/packaging/liblivebox-service.spec b/packaging/liblivebox-service.spec
index 15fd38c..1b44538 100644 (file)
--- a/packaging/liblivebox-service.spec
+++ b/packaging/liblivebox-service.spec
@@ -1,6 +1,6 @@
 Name: liblivebox-service
 Summary: Service API for gathering installed livebox information.
-Version: 0.4.2
+Version: 0.4.3
 Release: 1
 Group: HomeTF/Livebox
 License: Flora License

diff --git a/src/dlist.c b/src/dlist.c
index cf2cb63..fa3082a 100644 (file)
--- 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/livebox-service.c b/src/livebox-service.c
index 200cb99..a594516 100644 (file)
--- a/src/livebox-service.c
+++ b/src/livebox-service.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 c29f0b9..04ba967 100644 (file)
--- 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
  *