From 6064205f3031e16007a3b7025b0d397b85c742a5 Mon Sep 17 00:00:00 2001 From: Kyuho Jo Date: Mon, 4 May 2015 14:41:27 +0900 Subject: [PATCH] 1. Remove API set for domain from public API 2. Add new internal API for on-going type Change-Id: I22535d8009cef94dd27ab842fb1032e4bcc4a10d Signed-off-by: Kyuho Jo --- include/notification.h | 67 ------------------------ include/notification_internal.h | 4 ++ include/notification_text_domain.h | 101 +++++++++++++++++++++++++++++++++++++ packaging/notification.spec | 2 +- src/notification.c | 10 ++++ 5 files changed, 116 insertions(+), 68 deletions(-) create mode 100755 include/notification_text_domain.h diff --git a/include/notification.h b/include/notification.h index 84b30f1..92ee0db 100755 --- a/include/notification.h +++ b/include/notification.h @@ -319,74 +319,7 @@ int notification_set_time_to_text(notification_h noti, notification_text_type_e int notification_get_time_from_text(notification_h noti, notification_text_type_e type, time_t *time); -/** - * @internal - * @brief Sets the text domain to localize the notification. - * @since_tizen 2.3 - * @param[in] noti The notification handle - * @param[in] domain The text domain - * @param[in] dir The text dir - * @return #NOTIFICATION_ERROR_NONE on success, - * otherwise any other value on failure - * @retval #NOTIFICATION_ERROR_NONE Success - * @retval #NOTIFICATION_ERROR_INVALID_PARAMETER Invalid parameter - * @par Sample code: - * @code -#include -... -{ - notification_h noti = NULL; - int noti_err = NOTIFICATION_ERROR_NONE; - - noti = notification_create(NOTIFICATION_TYPE_NOTI); - if(noti == NULL) { - return; - } - - noti_err = notification_set_text_domain(noti, PACKAGE, LOCALEDIR); - if(noti_err != NOTIFICATION_ERROR_NONE) { - notification_free(noti); - return; - } -} - * @endcode - */ -int notification_set_text_domain(notification_h noti, - const char *domain, - const char *dir); -/** - * @internal - * @brief Gets the text domain from the notification handle. - * @since_tizen 2.3 - * @remarks Do not free returned domain and dir. They are freed when notification_free() or notification_free_list() is called. - * @param[in] noti The notification handle - * @param[out] domain The domain - * @param[out] dir The locale dir - * @return #NOTIFICATION_ERROR_NONE on success, - * otherwise any other value on failure - * @retval #NOTIFICATION_ERROR_NONE Success - * @retval #NOTIFICATION_ERROR_INVALID_PARAMETER Invalid parameter - * @par Sample code: - * @code -#include -... -{ - notification_h noti = NULL; - int noti_err = NOTIFICATION_ERROR_NONE; - char *domain = NULL; - char *dir = NULL; - - noti_err = notification_get_text_domain(noti, &domain, &dir); - if(noti_err != NOTIFICATION_ERROR_NONE) { - return; - } -} - * @endcode - */ -int notification_get_text_domain(notification_h noti, - char **domain, - char **dir); /** * @brief Sets the sound type for the notification. diff --git a/include/notification_internal.h b/include/notification_internal.h index c8df112..0de1b98 100755 --- a/include/notification_internal.h +++ b/include/notification_internal.h @@ -577,6 +577,10 @@ NOTIFICATION_DEPRECATED_API int notification_get_execute_option(notification_h n const char **text, bundle **service_handle); +int notification_set_ongoing_flag(notification_h noti, bool ongoing_flag); + +int notification_get_ongoing_flag(notification_h noti, bool *ongoing_flag); + /** * @} */ diff --git a/include/notification_text_domain.h b/include/notification_text_domain.h new file mode 100755 index 0000000..4ae429e --- /dev/null +++ b/include/notification_text_domain.h @@ -0,0 +1,101 @@ +/* + * libnotification + * + * Copyright (c) 2015 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Kyuho Jo + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#ifndef __NOTIFICATION_TEXT_DOMAIN_H__ +#define __NOTIFICATION_TEXT_DOMAIN_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @internal + * @brief Sets the text domain to localize the notification. + * @since_tizen 2.3 + * @param[in] noti The notification handle + * @param[in] domain The text domain + * @param[in] dir The text dir + * @return #NOTIFICATION_ERROR_NONE on success, + * otherwise any other value on failure + * @retval #NOTIFICATION_ERROR_NONE Success + * @retval #NOTIFICATION_ERROR_INVALID_PARAMETER Invalid parameter + * @par Sample code: + * @code +#include +... +{ + notification_h noti = NULL; + int noti_err = NOTIFICATION_ERROR_NONE; + + noti = notification_create(NOTIFICATION_TYPE_NOTI); + if(noti == NULL) { + return; + } + + noti_err = notification_set_text_domain(noti, PACKAGE, LOCALEDIR); + if(noti_err != NOTIFICATION_ERROR_NONE) { + notification_free(noti); + return; + } +} + * @endcode + */ +int notification_set_text_domain(notification_h noti, + const char *domain, + const char *dir); + +/** + * @internal + * @brief Gets the text domain from the notification handle. + * @since_tizen 2.3 + * @remarks Do not free returned domain and dir. They are freed when notification_free() or notification_free_list() is called. + * @param[in] noti The notification handle + * @param[out] domain The domain + * @param[out] dir The locale dir + * @return #NOTIFICATION_ERROR_NONE on success, + * otherwise any other value on failure + * @retval #NOTIFICATION_ERROR_NONE Success + * @retval #NOTIFICATION_ERROR_INVALID_PARAMETER Invalid parameter + * @par Sample code: + * @code +#include +... +{ + notification_h noti = NULL; + int noti_err = NOTIFICATION_ERROR_NONE; + char *domain = NULL; + char *dir = NULL; + + noti_err = notification_get_text_domain(noti, &domain, &dir); + if(noti_err != NOTIFICATION_ERROR_NONE) { + return; + } +} + * @endcode + */ +int notification_get_text_domain(notification_h noti, + char **domain, + char **dir); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif /* __NOTIFICATION_TEXT_DOMAIN_H__ */ diff --git a/packaging/notification.spec b/packaging/notification.spec index 7c52b2d..43e44da 100755 --- a/packaging/notification.spec +++ b/packaging/notification.spec @@ -1,6 +1,6 @@ Name: notification Summary: notification library -Version: 0.2.28 +Version: 0.2.29 Release: 1 Group: TBD License: Apache diff --git a/src/notification.c b/src/notification.c index 77f9714..3097938 100755 --- a/src/notification.c +++ b/src/notification.c @@ -3238,3 +3238,13 @@ EXPORT_API int notification_get_permission(notification_h handle, notification_p { return NOTIFICATION_ERROR_INVALID_OPERATION; } + +EXPORT_API int notification_set_ongoing_flag(notification_h noti, bool ongoing_flag) +{ + return NOTIFICATION_ERROR_INVALID_OPERATION; +} + +EXPORT_API int notification_get_ongoing_flag(notification_h noti, bool *ongoing_flag) +{ + return NOTIFICATION_ERROR_INVALID_OPERATION; +} -- 2.7.4