From 752e7a88d1f5588643dbd2ca5519c0cf73f69e68 Mon Sep 17 00:00:00 2001 From: youngsub ko Date: Thu, 2 May 2013 19:11:18 +0900 Subject: [PATCH] sync with private git. updated the license and the boilerplates --- LICENSE.Flora | 26 ++++---- NOTICE | 6 +- daemon/common.c | 2 +- daemon/common.h | 2 +- daemon/device/brightness.c | 2 +- daemon/idletxt/idletxt.c | 2 +- daemon/list_util.c | 2 +- daemon/list_util.h | 2 +- daemon/media.c | 2 +- daemon/media.h | 2 +- daemon/minictrl/minictrl.c | 2 +- daemon/modules.c | 2 +- daemon/modules.h | 2 +- daemon/notifications/animated_image.c | 2 +- daemon/notifications/animated_image.h | 2 +- daemon/notifications/noti.c | 111 ++++++++++++++++++++++------------ daemon/notifications/noti.h | 2 +- daemon/notifications/noti_box.c | 2 +- daemon/notifications/noti_box.h | 2 +- daemon/notifications/noti_gridbox.c | 2 +- daemon/notifications/noti_gridbox.h | 2 +- daemon/notifications/noti_list_item.c | 2 +- daemon/notifications/noti_list_item.h | 2 +- daemon/notifications/noti_listbox.c | 2 +- daemon/notifications/noti_listbox.h | 2 +- daemon/notifications/noti_node.c | 2 +- daemon/notifications/noti_node.h | 2 +- daemon/notifications/noti_section.c | 2 +- daemon/notifications/noti_section.h | 2 +- daemon/notifications/noti_util.c | 2 +- daemon/notifications/noti_util.h | 2 +- daemon/notifications/noti_win.c | 2 +- daemon/notifications/noti_win.h | 2 +- daemon/notifications/status_msg.c | 2 +- daemon/notifications/ticker.c | 22 ++++--- daemon/quickpanel-ui.c | 2 +- daemon/quickpanel-ui.h | 2 +- daemon/service/noti_led.c | 2 +- daemon/service/noti_led.h | 2 +- data/quickpanel_def.h | 2 +- test/quickpanel_debug_util.c | 2 +- test/quickpanel_debug_util.h | 2 +- 42 files changed, 142 insertions(+), 99 deletions(-) diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..571fe79 100755 --- 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 2295293..94d56df 100755 --- 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 5a4b81a..d1c21df 100755 --- 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 412296f..913054c 100755 --- 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 32d7a33..3a63d35 100755 --- 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 a63a74d..b1a9694 100755 --- 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 de38e04..5f1c7a6 100755 --- 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 7dbecc7..795178a 100755 --- 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 a7908b7..3991634 100755 --- 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 05a0ad7..f86ea45 100755 --- 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 04c605c..ee7f59f 100755 --- 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 f4a27f3..8aa0e44 100755 --- 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 99ec615..d35cec2 100755 --- 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 41aa2b4..45024fe 100755 --- 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 c5f2d80..8f61414 100755 --- 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 e9154fb..dddc98f 100755 --- 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, ¬i_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, ¬i_type); - notification_get_display_applist(new_noti, ¬i_applist); - notification_get_layout(new_noti, ¬i_layout); + if (noti_from_master == NULL) { + ERR("failed to get a notification from master"); + continue; + } + if (notification_clone(noti_from_master, ¬i_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, ¬i_type); + notification_get_display_applist(noti_new, ¬i_applist); + notification_get_layout(noti_new, ¬i_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, ¬i_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, ¬i_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, ¬i_type); + notification_get_type(noti_new, ¬i_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, ¬i_applist); + notification_get_display_applist(noti_new, ¬i_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 dbd269c..5bac7b0 100755 --- 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 ecc2983..3ca6cb8 100755 --- 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 2efc315..68ab375 100755 --- 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 d05fc89..50c1f8a 100755 --- 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 03b2eb4..9096d8f 100755 --- 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 dec9dd7..dad8096 100755 --- 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 1956201..b829ae5 100755 --- 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 78f0b6a..6cc0db7 100755 --- 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 1e78371..070e1c6 100755 --- 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 2d5b9a2..0d9166e 100755 --- 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 00debbc..5a43239 100755 --- 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 df38e54..4a1d55d 100755 --- 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 513ed45..12dd863 100755 --- 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 c4ade7f..d8fad68 100755 --- 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 43200f6..e12003d 100755 --- 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 c3228c6..f50075a 100755 --- 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 951ac06..b8345d3 100755 --- 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 898d7e4..ee6f8a6 100755 --- 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 c873185..e6a2148 100755 --- 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, ¬i_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, ¬i) != 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 75c42fb..721a561 100755 --- 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 19064ec..fb32a10 100755 --- 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 94479c9..cf93fe5 100755 --- 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 971ee0f..486e124 100755 --- 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 c3c1401..bf74ddb 100755 --- 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 3974d01..c151cfd 100755 --- 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 593cd38..350928b 100755 --- 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 * -- 2.7.4