From: Jihoon Kim Date: Mon, 7 Dec 2020 06:08:16 +0000 (+0900) Subject: Remove unused code X-Git-Tag: accepted/tizen/6.0/unified/20201221.010653~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F249610%2F2;p=platform%2Fcore%2Fuifw%2Fcapi-ui-sticker.git Remove unused code Change-Id: Ic4a1660edf15884c97906086187fef9003827019 Signed-off-by: Jihoon Kim --- diff --git a/client/src/sticker_dbus.c b/client/src/sticker_dbus.c index 985f7e2..a9f5635 100644 --- a/client/src/sticker_dbus.c +++ b/client/src/sticker_dbus.c @@ -190,51 +190,6 @@ static void _handle_sticker_consumer_cb(GDBusConnection *connection, } } } - - #if 0 // Receive the sticker information by asynchronous communication. - if (g_strcmp0(signal_name, "send_group_list") == 0) { - if (consumer_handle->group_foreach_cb != NULL) - _call_sticker_list_cb(consumer_handle, parameters, signal_name); - return; - } else if (g_strcmp0(signal_name, "send_keyword_list") == 0) { - if (consumer_handle->keyword_foreach_cb != NULL) - _call_sticker_list_cb(consumer_handle, parameters, signal_name); - return; - } - - sticker_data_h sticker_data = (sticker_data_h)calloc(1, sizeof(struct sticker_data_s)); - - if (!sticker_data) { - LOGE("failed to allocate memory"); - return; - } - - _get_sticker_info_from_gvariant(parameters, sticker_data); - - if (g_strcmp0(signal_name, "send_all_sticker_info") == 0) { - if (consumer_handle->data_foreach_cb != NULL) - consumer_handle->data_foreach_cb(sticker_data, consumer_handle->data_foreach_cb_user_data); - else - LOGW("No registered callback function"); - } else if (g_strcmp0(signal_name, "send_sticker_info_by_keyword") == 0) { - if (consumer_handle->data_foreach_by_keyword_cb != NULL) - consumer_handle->data_foreach_by_keyword_cb(sticker_data, consumer_handle->data_foreach_by_keyword_cb_user_data); - else - LOGW("No registered callback function"); - } else if (g_strcmp0(signal_name, "send_sticker_info_by_group") == 0) { - if (consumer_handle->data_foreach_by_group_cb != NULL) - consumer_handle->data_foreach_by_group_cb(sticker_data, consumer_handle->data_foreach_by_group_cb_user_data); - else - LOGW("No registered callback function"); - } else if (g_strcmp0(signal_name, "send_sticker_info_by_type") == 0) { - if (consumer_handle->data_foreach_by_type_cb != NULL) - consumer_handle->data_foreach_by_type_cb(sticker_data, consumer_handle->data_foreach_by_type_cb_user_data); - else - LOGW("No registered callback function"); - } - - _free_sticker_data(sticker_data); - #endif } //LCOV_EXCL_STOP @@ -263,26 +218,6 @@ static void _handle_sticker_provider_cb(GDBusConnection *connection, if (provider_handle->insert_finished_cb != NULL) _call_insert_finished_cb(provider_handle, parameters); } - - #if 0 // Receive the sticker information by asynchronous communication. - sticker_data_h sticker_data = (sticker_data_h)calloc(1, sizeof(struct sticker_data_s)); - - if (!sticker_data) { - LOGE("failed to allocate memory"); - return; - } - - _get_sticker_info_from_gvariant(parameters, sticker_data); - - if (g_strcmp0(signal_name, "send_sticker_info_by_appid") == 0) { - if (provider_handle->data_foreach_cb != NULL) - provider_handle->data_foreach_cb(sticker_data, provider_handle->data_foreach_cb_user_data); - else - LOGW("No registered callback function"); - } - - _free_sticker_data(sticker_data); - #endif } static int _dbus_signal_init(GDBusConnection *gdbus_connection, int *monitor_id, CLIENT_LIB lib, void *data) @@ -1209,4 +1144,4 @@ int sticker_dbus_get_sticker_info_by_uri(GDBusConnection *gdbus_connection, stic g_object_unref(reply); return ret; -} \ No newline at end of file +} diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c index dd506c7..d19dbdd 100644 --- a/server/stickerd_data_manager.c +++ b/server/stickerd_data_manager.c @@ -1335,78 +1335,6 @@ int stickerd_get_sticker_count(GVariant *parameters, GVariant **reply_body) return ret; } -#if 0 -// Send the sticker information by asynchronous communication. -static int send_sticker_info_async(int record_id, sticker_info_db_type type, const char *sender) -{ - int ret; - char *cmd = NULL; - - sticker_info_db *sticker_info = (sticker_info_db *)calloc(1, sizeof(sticker_info_db)); - - if (!sticker_info) - return STICKERD_SERVER_ERROR_OUT_OF_MEMORY; - - ret = stickerd_db_get_sticker_info_by_record_id(record_id, sticker_info); - if (ret != STICKERD_SERVER_ERROR_NONE) { - LOGE("Failed to get sticker info"); - free(sticker_info); - return STICKERD_SERVER_ERROR_OPERATION_FAILED; - } - - switch (type) { - case STICKER_DB_STICKER_ALL: - cmd = "send_all_sticker_info"; - break; - case STICKER_DB_STICKER_APPID: - cmd = "send_sticker_info_by_appid"; - break; - case STICKER_DB_STICKER_TYPE: - cmd = "send_sticker_info_by_type"; - break; - case STICKER_DB_STICKER_GROUP: - cmd = "send_sticker_info_by_group"; - break; - case STICKER_DB_STICKER_KEYWORD: - cmd = "send_sticker_info_by_keyword"; - break; - default: - cmd = ""; - break; - } - - GVariantBuilder *info_builder; - GVariantBuilder *keyword_builder; - - info_builder = g_variant_builder_new(G_VARIANT_TYPE("a{iv}")); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_INFO_ID, g_variant_new_int32(record_id)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_APP_ID, g_variant_new_string((const gchar *)sticker_info->app_id)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_URI_TYPE, g_variant_new_int32(sticker_info->type)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_URI, g_variant_new_string((const gchar *)sticker_info->uri)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_THUMBNAIL, g_variant_new_string((const gchar *)sticker_info->thumbnail)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_DESCRIPTION, g_variant_new_string((const gchar *)sticker_info->description)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_GROUP, g_variant_new_string((const gchar *)sticker_info->group)); - g_variant_builder_add(info_builder, "{iv}", STICKER_DATA_TYPE_DATE, g_variant_new_string((const gchar *)sticker_info->date)); - - keyword_builder = g_variant_builder_new(G_VARIANT_TYPE("a(s)")); - g_list_foreach(sticker_info->keyword, (GFunc) _set_keyword_builder, keyword_builder); - - GVariant *body = g_variant_new("(a{iv}a(s))", info_builder, keyword_builder); - g_variant_builder_unref(info_builder); - g_variant_builder_unref(keyword_builder); - - ret = stickerd_send_dbus_message(body, sender, cmd); - if (ret != STICKERD_SERVER_ERROR_NONE) { - LOGE("Failed to send sticker info to client"); - free(sticker_info); - return STICKERD_SERVER_ERROR_OPERATION_FAILED; - } - - free(sticker_info); - return ret; -} -#endif - static void _set_id_builder(char *id, GVariantBuilder *id_builder) { if (!id) { @@ -1843,4 +1771,4 @@ cleanup: } return ret; -} \ No newline at end of file +}