diff options
author | jusung son <jusung07.son@samsung.com> | 2016-03-22 10:39:25 +0900 |
---|---|---|
committer | jusung son <jusung07.son@samsung.com> | 2016-03-22 10:39:25 +0900 |
commit | 03ef33550ed17188ff4dbd8207347ac4954225d4 (patch) | |
tree | 69389d7a44e78e9df64c61494321e23f1cdcd78e | |
parent | 4ccdac1adbae03ca9663239dc1930c23c17ec946 (diff) | |
download | notification-03ef33550ed17188ff4dbd8207347ac4954225d4.tar.gz notification-03ef33550ed17188ff4dbd8207347ac4954225d4.tar.bz2 notification-03ef33550ed17188ff4dbd8207347ac4954225d4.zip |
remove unsupported APIsubmit/tizen/20160322.025756accepted/tizen/wearable/20160322.085202accepted/tizen/tv/20160322.085143accepted/tizen/mobile/20160322.085131accepted/tizen/ivi/20160322.085218
Change-Id: I344b390977a36e502f90793f03b5c3263b3fc8fe
Signed-off-by: jusung son <jusung07.son@samsung.com>
-rwxr-xr-x | CMakeLists.txt | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | include/notification.h | 22 | ||||
-rw-r--r-- | src/notification_old.c | 129 |
3 files changed, 1 insertions, 153 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cf1810f..1ce2f50 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,8 +22,7 @@ SET(SRCS ./src/notification_setting.c ./src/notification_setting_service.c ./src/notification_internal.c - ./src/notification_error.c - ./src/notification_old.c) + ./src/notification_error.c) SET(HEADERS-DEVEL ./include/notification.h ./include/notification_internal.h diff --git a/include/notification.h b/include/notification.h index 411848f..1d574b4 100644..100755 --- a/include/notification.h +++ b/include/notification.h @@ -1466,28 +1466,6 @@ int notification_set_auto_remove(notification_h noti, bool auto_remove); */ int notification_get_auto_remove(notification_h noti, bool *auto_remove); -/* For backward compatibility */ -/** - * @brief Wait for a response coming for this notification - * @details The notification should have the EXECUTE_TYPE_RESPONDING flag - * @remarks - * @param[in] noti notification handle - * @param[in] timeout in seconds - 0 for infinite - * @param[out] integer response - * @param[out] text response - * @return NOTIFICATION_ERROR_NONE if success, other value if failure - * @retval NOTIFICATION_ERROR_NONE - success - * @retval NOTIFICATION_ERROR_INVALID_PARAMETER - invalid parameter - * @retval NOTIFICATION_ERROR_OUT_OF_MEMORY - not enough memory - * @pre notification handle should be created by notification_new(). - * @post - * @see - */ -int notification_wait_response(notification_h noti, - int timeout, - int *respi, - char **respc); - /** * @} */ diff --git a/src/notification_old.c b/src/notification_old.c deleted file mode 100644 index b07627b..0000000 --- a/src/notification_old.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * libnotification - * - * Copyright (c) 2015 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: Kyuho Jo <kyuho.jo@samsung.com> - * - * 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. - * - */ - -#define _GNU_SOURCE /* for asprintf */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <fcntl.h> -#include <libintl.h> -#include <sys/socket.h> -#include <sys/syscall.h> -#include <sys/time.h> -#include <sys/un.h> -#include <bundle_internal.h> - -#include <notification.h> -#include <notification_internal.h> - -EXPORT_API int notification_wait_response(notification_h noti, - int timeout, - int *respi, - char **respc) -{ - bundle *b, *bc = NULL; - pid_t tid; - const char *tid_c; - int sock_fd, msg_fd; - char *sock_path; - struct sockaddr_un sock_addr; - char msg_buffer[1024]; - ssize_t msg_size; - struct timeval timeout_tv; - char *resp; - - memset(msg_buffer, 0, sizeof(msg_buffer)); - - /* a response packet *must* have an execute option TYPE_RESPONDING - with an associated bundle. - If its bundle does not already contain a "tid" hint (which - complex applications such as xwalk may overwrite), we will - try to find the TID and set it in the bundle ourselves. */ - notification_get_execute_option(noti, NOTIFICATION_EXECUTE_TYPE_RESPONDING, - NULL, &b); - - if (b == NULL) - return NOTIFICATION_ERROR_INVALID_PARAMETER; - - tid_c = bundle_get_val(b, "tid"); - if (tid_c == NULL) { - tid = syscall(SYS_gettid); - asprintf((char **)&tid_c, "%d", tid); - bc = bundle_dup(b); - bundle_add(bc, "tid", tid_c); - notification_set_execute_option(noti, NOTIFICATION_EXECUTE_TYPE_RESPONDING, - NULL, NULL, bc); - bundle_free(bc); - notification_update(noti); - } - - sock_fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); - if (sock_fd == -1) - return NOTIFICATION_ERROR_OUT_OF_MEMORY; - - sock_addr.sun_family = AF_UNIX; - asprintf(&sock_path, "/tmp/.notification-%s", tid_c); - strncpy(sock_addr.sun_path, sock_path, sizeof(sock_addr.sun_path) - 1); - if (bind(sock_fd, (struct sockaddr *)&sock_addr, sizeof(sock_addr)) == -1) { - close(sock_fd); - free(sock_path); - free((char *)tid_c); - return NOTIFICATION_ERROR_OUT_OF_MEMORY; - } - - if (timeout > 0) { - timeout_tv.tv_sec = timeout; - timeout_tv.tv_usec = 0; - setsockopt(sock_fd, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout_tv, sizeof(timeout_tv)); - setsockopt(sock_fd, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout_tv, sizeof(timeout_tv)); - } - - listen(sock_fd, 1); - msg_fd = accept(sock_fd, NULL, 0); - do { - msg_size = read(msg_fd, msg_buffer, 1024); - } while (msg_size > 0); - - resp = strtok(msg_buffer, "\n"); - if (resp) { - *respi = atoi(resp); - if (respc != NULL) { - resp = strtok(NULL, "\n"); - if (resp) - *respc = resp; - else - *respc = NULL; - } - } else { - *respi = 0; - if (respc != NULL) - *respc = NULL; - } - - close(msg_fd); - close(sock_fd); - unlink(sock_path); - free(sock_path); - free((char *)tid_c); - - return NOTIFICATION_ERROR_NONE; -} |