From e8f343d200e1b81be1e96e63b2dac2ef74c44a5b Mon Sep 17 00:00:00 2001 From: Kyuho Jo Date: Thu, 5 Mar 2015 14:39:14 +0900 Subject: [PATCH] Changes by ACR. Change-Id: I68d6074fa752372462d0c1fc1c6e16c78a07a603 Signed-off-by: Kyuho Jo --- include/notification.h | 8 +------- include/notification_error.h | 2 +- include/notification_type.h | 8 ++++++++ src/notification.c | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/notification.h b/include/notification.h index b7e3d48..a618e6e 100755 --- a/include/notification.h +++ b/include/notification.h @@ -48,8 +48,6 @@ extern "C" { /** * @brief Sets an absolute path for an image file to display on the notification view. * @since_tizen 2.3 - * @privlevel N/P - * @feature http://tizen.org/feature/notification * @param[in] noti The notification handle * @param[in] type The notification image type * @param[in] image_path The image file full path @@ -697,14 +695,11 @@ int notification_set_launch_option(notification_h noti, int notification_get_launch_option(notification_h noti, notification_launch_option_type type, void *option); - /** * @brief Sets the handler for a specific event. * @details When some event occurs on notification, application launched by app_control_send_launch_request with app_control handle.\n * Setting event handler of a button means that the notification will show the button. * @since_tizen 2.4 - * @privlevel N/P - * @feature http://tizen.org/feature/notification * @param[in] noti The notification handle * @param[in] event_type event type * @param[in] event_handler app control handle @@ -745,8 +740,6 @@ int notification_set_event_handler(notification_h noti, notification_event_type_ * @brief Gets the event handler of a specific event. * @remarks You must release @a app_control using app_control_destroy(). * @since_tizen 2.4 - * @privlevel N/P - * @feature http://tizen.org/feature/notification * @param[in] noti The notification handle * @param[in] event_type Launching option type * @param[out] option The pointer of App Control handler @@ -1553,6 +1546,7 @@ int notification_set_tag(notification_h noti, const char *tag); int notification_get_tag(notification_h noti, const char **tag); /** + * @internal * @brief Gets the package name of the notification * @since_tizen 2.4 * @privlevel NP diff --git a/include/notification_error.h b/include/notification_error.h index cf9bed7..a236e21 100755 --- a/include/notification_error.h +++ b/include/notification_error.h @@ -48,7 +48,7 @@ typedef enum _notification_error { NOTIFICATION_ERROR_FROM_DBUS = TIZEN_ERROR_NOTIFICATION | 0x03, /**< Error from DBus */ NOTIFICATION_ERROR_NOT_EXIST_ID = TIZEN_ERROR_NOTIFICATION | 0x04, /**< Not exist private ID */ NOTIFICATION_ERROR_SERVICE_NOT_READY = TIZEN_ERROR_NOTIFICATION | 0x05, /**< No reponse from notification service */ - NOTIFICATION_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< This operation is not supported */ + NOTIFICATION_ERROR_INVALID_OPERATION = TIZEN_ERROR_INVALID_OPERATION, /**< Function not implemented */ } notification_error_e; /** diff --git a/include/notification_type.h b/include/notification_type.h index 366fb32..5d012d6 100755 --- a/include/notification_type.h +++ b/include/notification_type.h @@ -173,6 +173,14 @@ typedef enum _notification_text_type { /**< Group content */ NOTIFICATION_TEXT_TYPE_GROUP_CONTENT_FOR_DISPLAY_OPTION_IS_OFF, /**< Group content for content display option is off of the Settings */ + NOTIFICATION_TEXT_TYPE_BUTTON_1, + /**< Text on button 1 */ + NOTIFICATION_TEXT_TYPE_BUTTON_2, + /**< Text on button 2 */ + NOTIFICATION_TEXT_TYPE_BUTTON_3, + /**< Text on button 3 */ + NOTIFICATION_TEXT_TYPE_BUTTON_4, + /**< Text on button 4 */ NOTIFICATION_TEXT_TYPE_MAX, /**< Max flag */ } notification_text_type_e; diff --git a/src/notification.c b/src/notification.c index 643a868..b49e5a9 100755 --- a/src/notification.c +++ b/src/notification.c @@ -1414,12 +1414,12 @@ EXPORT_API int notification_get_launch_option(notification_h noti, EXPORT_API int notification_set_event_handler(notification_h noti, notification_event_type_e event_type, app_control_h event_handler) { - return NOTIFICATION_ERROR_NOT_SUPPORTED; + return NOTIFICATION_ERROR_INVALID_OPERATION; } EXPORT_API int notification_get_event_handler(notification_h noti, notification_event_type_e event_type, app_control_h *event_handler) { - return NOTIFICATION_ERROR_NOT_SUPPORTED; + return NOTIFICATION_ERROR_INVALID_OPERATION; } EXPORT_API int notification_set_execute_option(notification_h noti, -- 2.7.4