From: Hyunho Kang Date: Wed, 16 Mar 2016 04:51:11 +0000 (+0900) Subject: Fix build error and remove warnings X-Git-Tag: submit/tizen/20160321.052611^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ccdac1adbae03ca9663239dc1930c23c17ec946;p=platform%2Fcore%2Fapi%2Fnotification.git Fix build error and remove warnings - remove unused functions Change-Id: Id291d8143916adbed5edb0c0130b5e198ed2e429 Signed-off-by: Hyunho Kang --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a61399ea..cf1810f6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,6 +65,7 @@ pkg_check_modules(pkgs REQUIRED ecore eina libtzplatform-config + glib-2.0 gio-2.0 ) diff --git a/include/notification_ipc.h b/include/notification_ipc.h index 66d567d2..2c91e0ff 100755 --- a/include/notification_ipc.h +++ b/include/notification_ipc.h @@ -59,8 +59,6 @@ int notification_ipc_request_delete_multiple(notification_type_e type, char *pkg int notification_ipc_request_delete_single(notification_type_e type, char *pkgname, int priv_id); int notification_ipc_update_setting(notification_setting_h setting); int notification_ipc_update_system_setting(notification_system_setting_h system_setting); -int notification_ipc_noti_setting_property_set(const char *pkgname, const char *property, const char *value); -int notification_ipc_noti_setting_property_get(const char *pkgname, const char *property, char **value); int notification_ipc_request_load_noti_by_tag(notification_h noti, const char *pkgname, const char *tag); int notification_ipc_request_load_noti_grouping_list(notification_type_e type, int count, notification_list_h *list); diff --git a/notification.pc.in b/notification.pc.in index f20fd1eb..9653c3f0 100644 --- a/notification.pc.in +++ b/notification.pc.in @@ -6,6 +6,6 @@ includedir=@INCLUDEDIR@ Name: notification Description: Notification Library Version: @VERSION@ -Requires: bundle capi-base-common capi-appfw-application +Requires: bundle glib-2.0 capi-base-common capi-appfw-application Libs: -L${libdir} -lnotification Cflags: -I${includedir} diff --git a/src/notification_ipc.c b/src/notification_ipc.c index eef8bf6b..0453361c 100755 --- a/src/notification_ipc.c +++ b/src/notification_ipc.c @@ -51,59 +51,6 @@ static int monitor_id = 0; static int provider_monitor_id = 0; static int is_master_started = 0; -static const char *NOTI_DATA_STRING[] = { - "NOTIFICATION_DATA_TYPE_NOTI_TYPE", - "NOTIFICATION_DATA_TYPE_LAYOUT", - "NOTIFICATION_DATA_TYPE_GROUP_ID", - "NOTIFICATION_DATA_TYPE_INTERNAL_GROUP_ID", - "NOTIFICATION_DATA_TYPE_PRIV_ID", - "NOTIFICATION_DATA_TYPE_CALLER_PKGNAME", - "NOTIFICATION_DATA_TYPE_LAUNCH_PKGNAME", - "NOTIFICATION_DATA_TYPE_ARGS", - "NOTIFICATION_DATA_TYPE_GROUP_ARGS", - "NOTIFICATION_DATA_TYPE_EXECUTE_OPTION", - "NOTIFICATION_DATA_TYPE_SERVICE_RESPONDING", - "NOTIFICATION_DATA_TYPE_SERVICE_SINGLE_LAUNCH", - "NOTIFICATION_DATA_TYPE_SERVICE_MULTI_LAUNCH", - "NOTIFICATION_DATA_TYPE_BUTTON1_EVENT", - "NOTIFICATION_DATA_TYPE_BUTTON2_EVENT", - "NOTIFICATION_DATA_TYPE_BUTTON3_EVENT", - "NOTIFICATION_DATA_TYPE_BUTTON4_EVENT", - "NOTIFICATION_DATA_TYPE_BUTTON5_EVENT", - "NOTIFICATION_DATA_TYPE_BUTTON6_EVENT", - "NOTIFICATION_DATA_TYPE_ICON_EVENT", - "NOTIFICATION_DATA_TYPE_THUMBNAIL_EVENT", - "NOTIFICATION_DATA_TYPE_DOMAIN", - "NOTIFICATION_DATA_TYPE_DIR", - "NOTIFICATION_DATA_TYPE_TEXT", - "NOTIFICATION_DATA_TYPE_KEY", - "NOTIFICATION_DATA_TYPE_FORMAT_ARGS", - "NOTIFICATION_DATA_TYPE_NUM_FORMAT_ARGS", - "NOTIFICATION_DATA_TYPE_IMAGE_PATH", - "NOTIFICATION_DATA_TYPE_SOUND_TYPE", - "NOTIFICATION_DATA_TYPE_SOUND_PATH", - "NOTIFICATION_DATA_TYPE_VIBRATION_TYPE", - "NOTIFICATION_DATA_TYPE_VIBRATION_PATH", - "NOTIFICATION_DATA_TYPE_LED_OPERATION", - "NOTIFICATION_DATA_TYPE_LED_ARGB", - "NOTIFICATION_DATA_TYPE_LED_ON_MS", - "NOTIFICATION_DATA_TYPE_LED_OFF_MS", - "NOTIFICATION_DATA_TYPE_TIME", - "NOTIFICATION_DATA_TYPE_INSERT_TIME", - "NOTIFICATION_DATA_TYPE_FLAGS_FOR_PROPERTY", - "NOTIFICATION_DATA_TYPE_DISPLAY_APPLIST", - "NOTIFICATION_DATA_TYPE_PROGRESS_SIZE", - "NOTIFICATION_DATA_TYPE_PROGRESS_PERCENTAGE", - "NOTIFICATION_DATA_TYPE_APP_ICON_PATH", - "NOTIFICATION_DATA_TYPE_APP_NAME", - "NOTIFICATION_DATA_TYPE_TEMP_TITLE", - "NOTIFICATION_DATA_TYPE_TEMP_CONTENT", - "NOTIFICATION_DATA_TYPE_TAG", - "NOTIFICATION_DATA_TYPE_ONGOING_FLAG", - "NOTIFICATION_DATA_TYPE_AUTO_REMOVE", -}; - - typedef struct _result_cb_item { void (*result_cb)(int priv_id, int result, void *data); void *data; @@ -1259,63 +1206,6 @@ int notification_ipc_update_system_setting(notification_system_setting_h system_ return result; } -int notification_ipc_noti_setting_property_set(const char *pkgname, const char *property, const char *value) -{ - int result; - GDBusMessage *reply = NULL; - GVariant *body; - - result = _dbus_init(); - if (result != NOTIFICATION_ERROR_NONE) { - NOTIFICATION_ERR("Can't init dbus %d", result); - return result; - } - body = g_variant_new("(sss)", pkgname, property, value); - - result = _send_sync_noti(body, &reply, "set_noti_property"); - - if (reply) - g_object_unref(reply); - - NOTIFICATION_DBG("notification_ipc_noti_setting_property_set done [result: %d]", result); - return result; -} - -int notification_ipc_noti_setting_property_get(const char *pkgname, const char *property, char **value) -{ - int result; - GDBusMessage *reply = NULL; - GVariant *body; - GVariant *reply_body = NULL; - gchar *ret_val; - - result = _dbus_init(); - - if (result != NOTIFICATION_ERROR_NONE) { - NOTIFICATION_ERR("Can't init dbus %d", result); - return result; - } - - body = g_variant_new("(ss)", pkgname, property); - result = _send_sync_noti(body, &reply, "get_noti_property"); - - if (result == NOTIFICATION_ERROR_NONE) { - reply_body = g_dbus_message_get_body(reply); - g_variant_get(body, "(s)", &ret_val); - - if (ret_val != NULL) { - *value = g_strdup(ret_val); - g_free(ret_val); - } - } - - if(reply) - g_object_unref(reply); - - NOTIFICATION_DBG("notification_ipc_noti_setting_property_get done [result: %d]", result); - return result; -} - EXPORT_API GVariant *notification_ipc_make_gvariant_from_noti(notification_h noti) { NOTIFICATION_DBG("make gvariant from noti");