sync with private git. updated the license and the boilerplates

diff --git a/LICENSE.Flora b/LICENSE.Flora
index fd90a36f1d61ce22c607611e4684c41a74226992..571fe7991f5777337d80bf49508e8d7e2f4d136b 100755 (executable)
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -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/NOTICE b/NOTICE
index 22952932f3a38fcb2988168c81e5677fc5c458a7..94d56df26bd88f9b93fca35b03ccb87152e1ff18 100755 (executable)
--- a/NOTICE
+++ b/NOTICE
@@ -1,3 +1,3 @@
-Copyright (c) Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Flora License, Version 1.
-Please, see the LICENSE.flora file for Flora License terms and conditions
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.1
+Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.

diff --git a/daemon/common.c b/daemon/common.c
index 5a4b81ad2b523280df9ba70d16fef6e0280044ea..d1c21df4d8be501e88181a4f8823f4deddd3e2d5 100755 (executable)
--- a/daemon/common.c
+++ b/daemon/common.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/common.h b/daemon/common.h
index 412296f44e98489d1c82d6fcd24dadea9ea38d97..913054c938b21d83cc7624ea117105c1f24ab4ee 100755 (executable)
--- a/daemon/common.h
+++ b/daemon/common.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/device/brightness.c b/daemon/device/brightness.c
index 32d7a33578ccc4fdfeec3812b7e689ce7f699391..3a63d35ecce8be12577109db9f717a9c3e7ccb0f 100755 (executable)
--- a/daemon/device/brightness.c
+++ b/daemon/device/brightness.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/idletxt/idletxt.c b/daemon/idletxt/idletxt.c
index a63a74d876cb2836d77d75d9b654dc0ad20b6843..b1a9694889a97fe5a1e5fd3a50d8b1cc54426091 100755 (executable)
--- a/daemon/idletxt/idletxt.c
+++ b/daemon/idletxt/idletxt.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/list_util.c b/daemon/list_util.c
index de38e04185ade0a5e6380763ccc19b2f1ef179ac..5f1c7a6d78c34d1ba79292c41d43449a6a331a82 100755 (executable)
--- a/daemon/list_util.c
+++ b/daemon/list_util.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/list_util.h b/daemon/list_util.h
index 7dbecc7a9908f2ca024a077ce12f12e8d791ef9e..795178a7934ef5b8d94633c8aea9bfdc9e172955 100755 (executable)
--- a/daemon/list_util.h
+++ b/daemon/list_util.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/media.c b/daemon/media.c
index a7908b75e640d775df69e40602f9fefec80d3fa1..3991634e7c746e4be38951dd1f4a2bdeca5f67cc 100755 (executable)
--- a/daemon/media.c
+++ b/daemon/media.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/media.h b/daemon/media.h
index 05a0ad7502c24571241cc74f20a6c24c84ba04e2..f86ea455b1b95e6db877c89e2acf7cf9af75c000 100755 (executable)
--- a/daemon/media.h
+++ b/daemon/media.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/minictrl/minictrl.c b/daemon/minictrl/minictrl.c
index 04c605cc9f7b152c7b14c9271a4b1ac974eae720..ee7f59ffb178f02b8690cb9b550f2ec3c0542486 100755 (executable)
--- a/daemon/minictrl/minictrl.c
+++ b/daemon/minictrl/minictrl.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/modules.c b/daemon/modules.c
index f4a27f3b57dd141bec3aae6054480f9e97378c82..8aa0e44d64fe0cc584e72266a0986f2faa99cbed 100755 (executable)
--- a/daemon/modules.c
+++ b/daemon/modules.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/modules.h b/daemon/modules.h
index 99ec6151ca609e6baed0e89b6602a83260d10e3c..d35cec2d2e95b91686db4710c4a9813b96537680 100755 (executable)
--- a/daemon/modules.h
+++ b/daemon/modules.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/animated_image.c b/daemon/notifications/animated_image.c
index 41aa2b490438710d65dbaa0926eb3c737798ab12..45024fe9cedd84e58d8529c22303b9d76a243fd8 100755 (executable)
--- a/daemon/notifications/animated_image.c
+++ b/daemon/notifications/animated_image.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/animated_image.h b/daemon/notifications/animated_image.h
index c5f2d80d7c121e0c455ff52411cd85e586c16114..8f61414115d59f73a0b7727c6bfeb78a0aa8dc08 100755 (executable)
--- a/daemon/notifications/animated_image.h
+++ b/daemon/notifications/animated_image.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti.c b/daemon/notifications/noti.c
index e9154fb833e29d136a67f0aa6d3b09e121f5dd2d..dddc98fab96c3db2dd15b625acfb69b8fe7bdf37 100755 (executable)
--- a/daemon/notifications/noti.c
+++ b/daemon/notifications/noti.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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
  *
@@ -772,7 +772,8 @@ static void _quickpanel_noti_detailed_changed_cb(void *data, notification_type_e
        int op_type = 0;
        int priv_id = 0;
        struct appdata *ad = NULL;
-       notification_h new_noti = NULL;
+       notification_h noti_new = NULL;
+       notification_h noti_from_master = NULL;
        notification_type_e noti_type = NOTIFICATION_TYPE_NONE;
        int noti_applist = NOTIFICATION_DISPLAY_APP_ALL;
        notification_ly_type_e noti_layout = NOTIFICATION_LY_NONE;
@@ -780,23 +781,34 @@ static void _quickpanel_noti_detailed_changed_cb(void *data, notification_type_e
        retif(data == NULL, , "Invalid parameter!");
        ad = data;
 
-       DBG("test detailed quickpanel:%d", num_op);
+       ERR("num_op:%d", num_op);
 
        for (i = 0; i < num_op; i++) {
                notification_op_get_data(op_list + i, NOTIFICATION_OP_DATA_TYPE, &op_type);
-               DBG("op_type:%d", op_type);
                notification_op_get_data(op_list + i, NOTIFICATION_OP_DATA_PRIV_ID, &priv_id);
-               DBG("op_priv_id:%d", priv_id);
+               notification_op_get_data(op_list + i, NOTIFICATION_OP_DATA_NOTI, &noti_from_master);
+
+               ERR("noti operation:%d privid:%d", op_type, priv_id);
 
                if (op_type == NOTIFICATION_OP_INSERT) {
-                       new_noti = notification_load(NULL, priv_id);
-                       if (new_noti == NULL) continue;
 
-                       notification_get_type(new_noti, &noti_type);
-                       notification_get_display_applist(new_noti, &noti_applist);
-                       notification_get_layout(new_noti, &noti_layout);
+                       if (noti_from_master == NULL) {
+                               ERR("failed to get a notification from master");
+                               continue;
+                       }
+                       if (notification_clone(noti_from_master, &noti_new) != NOTIFICATION_ERROR_NONE) {
+                               ERR("failed to create a cloned notification");
+                               continue;
+                       }
 
-                       DBG("layout:%d", noti_layout);
+                       _print_debuginfo_from_noti(noti_new);
+#ifdef QP_SERVICE_NOTI_LED_ENABLE
+                       quickpanel_service_noti_led_on(noti_new);
+#endif
+
+                       notification_get_type(noti_new, &noti_type);
+                       notification_get_display_applist(noti_new, &noti_applist);
+                       notification_get_layout(noti_new, &noti_layout);
 
                        if (noti_applist & NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY) {
                                noti_node_item *node = noti_node_get(g_noti_node, priv_id);
@@ -804,25 +816,29 @@ static void _quickpanel_noti_detailed_changed_cb(void *data, notification_type_e
                                        if (noti_type == NOTIFICATION_TYPE_NOTI) {
                                                DBG("cb after inserted:%d", priv_id);
                                        }
+                                       notification_free(noti_new);
                                } else {
                                        if (noti_type == NOTIFICATION_TYPE_NOTI) {
-                                               _quickpanel_noti_noti_add(ad->list, new_noti, GRIDBOX_PREPEND);
+                                               _quickpanel_noti_noti_add(ad->list, noti_new, GRIDBOX_PREPEND);
                                        } else if (noti_type == NOTIFICATION_TYPE_ONGOING) {
-                                               _quickpanel_noti_ongoing_add(ad->list, new_noti, LISTBOX_PREPEND);
+                                               _quickpanel_noti_ongoing_add(ad->list, noti_new, LISTBOX_PREPEND);
                                        }
                                }
-                               DBG("%d noti added", priv_id);
                        } else {
-                               notification_free(new_noti);
+                               notification_free(noti_new);
                        }
-               }
-               if (op_type == NOTIFICATION_OP_DELETE) {
+               } else if (op_type == NOTIFICATION_OP_DELETE) {
                        noti_node_item *node = noti_node_get(g_noti_node, priv_id);
 
                        if (node != NULL && node->noti != NULL) {
                                notification_h noti = node->noti;
                                notification_get_type(noti, &noti_type);
 
+#ifdef QP_SERVICE_NOTI_LED_ENABLE
+                               quickpanel_service_noti_led_off(noti);
+#endif
+                               _print_debuginfo_from_noti(noti);
+
                                if (noti_type == NOTIFICATION_TYPE_NOTI) {
                                        gridbox_remove_item(g_noti_gridbox, node->view, 0);
                                } else if (noti_type == NOTIFICATION_TYPE_ONGOING) {
@@ -830,29 +846,38 @@ static void _quickpanel_noti_detailed_changed_cb(void *data, notification_type_e
                                }
                                noti_node_remove(g_noti_node, priv_id);
                        }
-                       DBG("%d noti deleted", priv_id);
-               }
-               if (op_type == NOTIFICATION_OP_UPDATE) {
+               } else if (op_type == NOTIFICATION_OP_UPDATE) {
                        noti_node_item *node = noti_node_get(g_noti_node, priv_id);
                        notification_h old_noti = NULL;
 
-                       new_noti = notification_load(NULL, priv_id);
-                       retif(new_noti == NULL, , "fail to load updated noti");
+                       if (noti_from_master == NULL) {
+                               ERR("failed to get a notification from master");
+                               continue;
+                       }
+                       if (notification_clone(noti_from_master, &noti_new) != NOTIFICATION_ERROR_NONE) {
+                               ERR("failed to create a cloned notification");
+                               continue;
+                       }
+
+#ifdef QP_SERVICE_NOTI_LED_ENABLE
+                       quickpanel_service_noti_led_on(noti_new);
+#endif
+                       _print_debuginfo_from_noti(noti_new);
 
                        if (node != NULL && node->view != NULL && node->noti != NULL) {
-                               notification_get_type(new_noti, &noti_type);
+                               notification_get_type(noti_new, &noti_type);
 
                                if (noti_type == NOTIFICATION_TYPE_NOTI) {
                                        gridbox_remove_item(g_noti_gridbox, node->view, 0);
-                                       _quickpanel_noti_noti_add(ad->list, new_noti, GRIDBOX_PREPEND);
+                                       _quickpanel_noti_noti_add(ad->list, noti_new, GRIDBOX_PREPEND);
 /*
                                        gridbox_remove_and_add_item(g_noti_gridbox, node->view,
                                                        _quickpanel_noti_noti_add
-                                                       ,ad->list, new_noti, GRIDBOX_PREPEND);
+                                                       ,ad->list, noti_new, GRIDBOX_PREPEND);
 */
                                } else if (noti_type == NOTIFICATION_TYPE_ONGOING) {
                                        old_noti = node->noti;
-                                       node->noti = new_noti;
+                                       node->noti = noti_new;
 
                                        listbox_update_item(g_noti_listbox, node->view);
                                }
@@ -861,19 +886,27 @@ static void _quickpanel_noti_detailed_changed_cb(void *data, notification_type_e
                                        notification_free(old_noti);
                                }
                        } else {
-                               notification_get_display_applist(new_noti, &noti_applist);
+                               notification_get_display_applist(noti_new, &noti_applist);
 
                                if (noti_applist & NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY) {
-
                                        if (noti_type == NOTIFICATION_TYPE_NOTI) {
-                                               _quickpanel_noti_noti_add(ad->list, new_noti, GRIDBOX_PREPEND);
+                                               _quickpanel_noti_noti_add(ad->list, noti_new, GRIDBOX_PREPEND);
                                        } else if (noti_type == NOTIFICATION_TYPE_ONGOING) {
-                                               _quickpanel_noti_ongoing_add(ad->list, new_noti, GRIDBOX_PREPEND);
+                                               _quickpanel_noti_ongoing_add(ad->list, noti_new, GRIDBOX_PREPEND);
                                        }
+                               } else {
+                                       notification_free(noti_new);
                                }
                        }
+               } else if (op_type == NOTIFICATION_OP_REFRESH) {
+                       _quickpanel_noti_update_notilist(ad);
+               } else if (op_type == NOTIFICATION_OP_SERVICE_READY) {
+                       _quickpanel_noti_update_notilist(ad);
 
-                       DBG("%d noti updated", priv_id);
+#ifdef QP_SERVICE_NOTI_LED_ENABLE
+                       quickpanel_service_noti_init(ad);
+                       quickpanel_service_noti_led_on(NULL);
+#endif
                }
        }
 
@@ -1067,9 +1100,6 @@ static void _quickpanel_noti_init(void *data)
                gridbox_set_item_deleted_cb(g_noti_gridbox, _quickpanel_noti_box_deleted_cb);
                quickpanel_list_util_sort_insert(ad->list, g_noti_gridbox);
        }
-
-       /* Update notification list */
-       _quickpanel_noti_update_notilist(ad);
 }
 
 static void _quickpanel_noti_fini(void *data)
@@ -1098,6 +1128,11 @@ static void _quickpanel_noti_fini(void *data)
        }
 }
 
+static void _quickpanel_noti_cleanup(void *data) {
+       notifiation_clear(NOTIFICATION_TYPE_ONGOING);
+       _quickpanel_noti_delete_volatil_data();
+}
+
 static int quickpanel_noti_init(void *data)
 {
        struct appdata *ad = data;
@@ -1109,9 +1144,11 @@ static int quickpanel_noti_init(void *data)
 
        is_first = _quickpanel_noti_check_first_start();
        if (is_first) {
-               /* Remove ongoing and volatile noti data */
-               notifiation_clear(NOTIFICATION_TYPE_ONGOING);
-               _quickpanel_noti_delete_volatil_data();
+               if (notification_is_service_ready()) {
+                       _quickpanel_noti_cleanup(ad);
+               } else {
+                       notification_add_deffered_task(_quickpanel_noti_cleanup, ad);
+               }
        }
 
        _quickpanel_noti_init(ad);

diff --git a/daemon/notifications/noti.h b/daemon/notifications/noti.h
index dbd269c987a8feb2b453ab72f099de0f760caf42..5bac7b0e9c46067b6dda5fba849be12bc9c00006 100755 (executable)
--- a/daemon/notifications/noti.h
+++ b/daemon/notifications/noti.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_box.c b/daemon/notifications/noti_box.c
index ecc2983a2862aea7e18b20909750dcecbcb499b1..3ca6cb8c9c13a5b93991d0a7ee33b0424125a88b 100755 (executable)
--- a/daemon/notifications/noti_box.c
+++ b/daemon/notifications/noti_box.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_box.h b/daemon/notifications/noti_box.h
index 2efc315b0c4e6a52fc567aa14f0c526ceac5711b..68ab3758489c8ec2aae88a8c6b864255d8b52dce 100755 (executable)
--- a/daemon/notifications/noti_box.h
+++ b/daemon/notifications/noti_box.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_gridbox.c b/daemon/notifications/noti_gridbox.c
index d05fc89070e692195d372bd78c9a286e46956388..50c1f8ae0a9c800955a216e63208041c27838e2f 100755 (executable)
--- a/daemon/notifications/noti_gridbox.c
+++ b/daemon/notifications/noti_gridbox.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_gridbox.h b/daemon/notifications/noti_gridbox.h
index 03b2eb4ec7002f7d12c711333bc69829f1962eeb..9096d8faaf6b210be59c992395f50f16d08017a5 100755 (executable)
--- a/daemon/notifications/noti_gridbox.h
+++ b/daemon/notifications/noti_gridbox.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_list_item.c b/daemon/notifications/noti_list_item.c
index dec9dd7246ed494f562f5a6ee4b1bc3aff4a117b..dad8096f248710f0284dff2257bb1ac9266d46b2 100755 (executable)
--- a/daemon/notifications/noti_list_item.c
+++ b/daemon/notifications/noti_list_item.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_list_item.h b/daemon/notifications/noti_list_item.h
index 195620125e0572bcd7f80608dea50a0b9b3c2f80..b829ae53e5462e8dae4180bc2e39d98dda82a68e 100755 (executable)
--- a/daemon/notifications/noti_list_item.h
+++ b/daemon/notifications/noti_list_item.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_listbox.c b/daemon/notifications/noti_listbox.c
index 78f0b6a8b03bb46a9957e319a9645fd3d113379b..6cc0db76f140bb1b2c84385859d020281af05b00 100755 (executable)
--- a/daemon/notifications/noti_listbox.c
+++ b/daemon/notifications/noti_listbox.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_listbox.h b/daemon/notifications/noti_listbox.h
index 1e783710bc0eff62b45ccfe77ab9bcbf6b979b6c..070e1c62cab4ba106bf15a65fe23c766c8a59caa 100755 (executable)
--- a/daemon/notifications/noti_listbox.h
+++ b/daemon/notifications/noti_listbox.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_node.c b/daemon/notifications/noti_node.c
index 2d5b9a2a7c83756011e6551d779a916d9b73bc68..0d9166e09394b6eddeb2ad7b5e9a9b245f5c5ce9 100755 (executable)
--- a/daemon/notifications/noti_node.c
+++ b/daemon/notifications/noti_node.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_node.h b/daemon/notifications/noti_node.h
index 00debbccc5140227d8e98b5ee2faf371c8c7ac9a..5a4323989b5302350ab38f3ae3e2ee8b63d2aa6c 100755 (executable)
--- a/daemon/notifications/noti_node.h
+++ b/daemon/notifications/noti_node.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_section.c b/daemon/notifications/noti_section.c
index df38e545518db3ac5bd1eddf281b404e2b6fb92e..4a1d55d7fef50c1cdfe4a50c4d597ca2c11ff6c2 100755 (executable)
--- a/daemon/notifications/noti_section.c
+++ b/daemon/notifications/noti_section.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_section.h b/daemon/notifications/noti_section.h
index 513ed45b0232dc0c43c7156d02108403c22824d7..12dd8632e406bee5c0646041ee866bcf83397c5f 100755 (executable)
--- a/daemon/notifications/noti_section.h
+++ b/daemon/notifications/noti_section.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_util.c b/daemon/notifications/noti_util.c
index c4ade7f99bbd0a3df275944ec176666e5543cf4c..d8fad6864e4a5851eb90da56bc0553313dfcd5b7 100755 (executable)
--- a/daemon/notifications/noti_util.c
+++ b/daemon/notifications/noti_util.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_util.h b/daemon/notifications/noti_util.h
index 43200f61e92880edeeca5b3ef18a635f542f1eab..e12003d59cc3d1ad08b1a173d20ebfcca7b83110 100755 (executable)
--- a/daemon/notifications/noti_util.h
+++ b/daemon/notifications/noti_util.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_win.c b/daemon/notifications/noti_win.c
index c3228c68991c431f6e90be60b97f60f56dc7fee5..f50075a4223a8f0609ad7694ecfcb426fd79d80b 100755 (executable)
--- a/daemon/notifications/noti_win.c
+++ b/daemon/notifications/noti_win.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/noti_win.h b/daemon/notifications/noti_win.h
index 951ac06d98348d621d783a7e234c703f8240ee56..b8345d39d762d4cf9ffe9dec729354291e870157 100755 (executable)
--- a/daemon/notifications/noti_win.h
+++ b/daemon/notifications/noti_win.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/status_msg.c b/daemon/notifications/status_msg.c
index 898d7e4b9e8040ae0c30eee1f76aca8dc5d6cb80..ee6f8a606e80b99fc40e70c3e6182a75f7d67262 100755 (executable)
--- a/daemon/notifications/status_msg.c
+++ b/daemon/notifications/status_msg.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/notifications/ticker.c b/daemon/notifications/ticker.c
index c873185c9339e3caf6e948408b651a389d250c6c..e6a21489dfedb6bdf2ee7550255a1ad3eb145820 100755 (executable)
--- a/daemon/notifications/ticker.c
+++ b/daemon/notifications/ticker.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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
  *
@@ -705,6 +705,7 @@ static void _quickpanel_noti_media_feedback(notification_h noti) {
 static void _quickpanel_ticker_noti_detailed_changed_cb(void *data, notification_type_e type, notification_op *op_list, int num_op)
 {
        notification_h noti = NULL;
+       notification_h noti_from_master = NULL;
        int flags = 0;
        int applist = NOTIFICATION_DISPLAY_APP_ALL;
        int op_type = 0;
@@ -722,18 +723,23 @@ static void _quickpanel_ticker_noti_detailed_changed_cb(void *data, notification
        if (num_op == 1) {
                notification_op_get_data(op_list, NOTIFICATION_OP_DATA_TYPE, &op_type);
                notification_op_get_data(op_list, NOTIFICATION_OP_DATA_PRIV_ID, &priv_id);
+               notification_op_get_data(op_list, NOTIFICATION_OP_DATA_NOTI, &noti_from_master);
                DBG("op_type:%d", op_type);
                DBG("op_priv_id:%d", priv_id);
+               DBG("noti:%p", noti_from_master);
 
-               if (op_type == NOTIFICATION_OP_INSERT) {
-                       noti = notification_load(NULL, priv_id);
-               } else if (op_type == NOTIFICATION_OP_UPDATE) {
-                       noti = notification_load(NULL, priv_id);
-               } else {
+               if (op_type != NOTIFICATION_OP_INSERT &&
+                               op_type != NOTIFICATION_OP_UPDATE) {
+                       return ;
+               }
+               if (noti_from_master == NULL) {
+                       ERR("failed to get a notification from master");
+                       return ;
+               }
+               if (notification_clone(noti_from_master, &noti) != NOTIFICATION_ERROR_NONE) {
+                       ERR("failed to create a cloned notification");
                        return ;
                }
-       } else {
-               return ;
        }
 
        retif(noti == NULL, ,"noti is NULL");

diff --git a/daemon/quickpanel-ui.c b/daemon/quickpanel-ui.c
index 75c42fba5a2dcad3b231932451abbcbf21ac1d66..721a56159029b91352fc02b81d9a162ae155e003 100755 (executable)
--- a/daemon/quickpanel-ui.c
+++ b/daemon/quickpanel-ui.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/quickpanel-ui.h b/daemon/quickpanel-ui.h
index 19064ecacfb6773658b92baefc52e24a8f112292..fb32a107be2c4d5533d01799f40bf4d684924436 100755 (executable)
--- a/daemon/quickpanel-ui.h
+++ b/daemon/quickpanel-ui.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/service/noti_led.c b/daemon/service/noti_led.c
index 94479c990219d1589c1d812f6024cc39aa1e9420..cf93fe569b1723b3c17d7095aa57b4d948b82f78 100755 (executable)
--- a/daemon/service/noti_led.c
+++ b/daemon/service/noti_led.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/daemon/service/noti_led.h b/daemon/service/noti_led.h
index 971ee0f0704e8e3e45e629faa334c7c1a4eb2f2d..486e1243a8e7c5ff4a68dba832b0c762285e40dd 100755 (executable)
--- a/daemon/service/noti_led.h
+++ b/daemon/service/noti_led.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/data/quickpanel_def.h b/data/quickpanel_def.h
index c3c14019a70bede0c6b524878bcfefbebc868031..bf74ddb884483eabb5da1353391baf19120a436c 100755 (executable)
--- a/data/quickpanel_def.h
+++ b/data/quickpanel_def.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/test/quickpanel_debug_util.c b/test/quickpanel_debug_util.c
index 3974d01d33babca2dc6d9a517ddf0d978439fb09..c151cfddf258967eb8457a0d3d6aa22e6d55f372 100755 (executable)
--- a/test/quickpanel_debug_util.c
+++ b/test/quickpanel_debug_util.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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/test/quickpanel_debug_util.h b/test/quickpanel_debug_util.h
index 593cd38c1065e487592b3226a165dc1b37c0b780..350928b2c1ef32d405487614bd29b7e931cee781 100755 (executable)
--- a/test/quickpanel_debug_util.h
+++ b/test/quickpanel_debug_util.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2012  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
  *