[ACR-1309] Remove deprecated API

Change-Id: Icdfd28d25f901ddb4c87c66082a23a2958b98b9d
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/include/thumbnail_util.h b/include/thumbnail_util.h
index c0338be9d998168d3e95838447da06d798b13918..1773eee91e91ffbfc876086686e4ba5e03c0c294 100755 (executable)
--- a/include/thumbnail_util.h
+++ b/include/thumbnail_util.h
@@ -155,24 +155,6 @@ int thumbnail_util_set_size(thumbnail_h thumb, int width, int height) TIZEN_DEPR
  */
 int thumbnail_util_cancel(thumbnail_h thumb, const char *request_id) TIZEN_DEPRECATED_API;
 
-/**
- * @deprecated Deprecated since 4.0.
- * @brief Cancels all thumbnail extraction requests associated with the given thumbnail info handle.
- * @since_tizen @if MOBILE 2.4 @elseif WEARABLE 3.0 @endif
- * @remarks If there is no item you want to cancel, this function return MEDIA_CONTENT_ERROR_INVALID_OPERATION
- *
- * @param[in] thumb The media thumbnail info handle
- *
- * @return @c 0 on success, otherwise a negative error value
- *
- * @retval #THUMBNAIL_UTIL_ERROR_NONE              Successful
- * @retval #THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER Invalid parameter
- *
- * @pre It is available before thumbnail_extracted_cb() is called.
- * @see thumbnail_util_extract()
- */
-int thumbnail_util_cancel_all(thumbnail_h thumb) TIZEN_DEPRECATED_API;
-
 /**
  * @deprecated Deprecated since 5.0.
  * @brief Destroys thumbnail info handle.

diff --git a/src/thumbnail_util.c b/src/thumbnail_util.c
index 329b759e8b42c9bb8cc6ab561b8b3f943b7a4e75..a5ebca3563cbff8112a9ff9db617e8d0e2298a5d 100755 (executable)
--- a/src/thumbnail_util.c
+++ b/src/thumbnail_util.c
@@ -225,23 +225,6 @@ int thumbnail_util_cancel(thumbnail_h thumb, const char *request_id)
        return ret;
 }
 
-int thumbnail_util_cancel_all(thumbnail_h thumb)
-{
-       thumbnail_util_warn("DEPRECATION WARNING: thumbnail_util_cancel_all() is deprecated and will be removed from next release.");
-       int ret = THUMBNAIL_UTIL_ERROR_NONE;
-       thumbnail_s *_thumb = (thumbnail_s *)thumb;
-
-       if (_thumb != NULL) {
-               ret = thumbnail_request_cancel_all();
-       } else {
-               thumbnail_util_error("INVALID_PARAMETER(0x%08x)", THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER);
-               ret = THUMBNAIL_UTIL_ERROR_INVALID_PARAMETER;
-       }
-
-       return ret;
-}
-
-
 int thumbnail_util_destroy(thumbnail_h thumb)
 {
        thumbnail_util_warn("DEPRECATION WARNING: thumbnail_util_destroy() is deprecated and will be removed from next release.");

diff --git a/test/thumbnail_util_test.c b/test/thumbnail_util_test.c
index abbf343b00ae083a8b790be4f89ad4f2009c87d3..546b13ef3520f9d1a1ea3758e5f61157db0aa0f9 100755 (executable)
--- a/test/thumbnail_util_test.c
+++ b/test/thumbnail_util_test.c
@@ -105,14 +105,7 @@ gboolean cancel_all(gpointer data)
        int ret = THUMBNAIL_UTIL_ERROR_NONE;
        thumbnail_h _media_thumb;
        thumbnail_util_create(&_media_thumb);
-#if 0
-       ret = thumbnail_util_cancel_all(_media_thumb);
 
-       if (ret == THUMBNAIL_UTIL_ERROR_NONE)
-               thumbnail_util_debug("thumbnail_util_cancel_all is success");
-       else
-               thumbnail_util_error("thumbnail_util_cancel_all is failed");
-#else
        int i, num;
        num = atoi(g_id);
        char *req_str = NULL;
@@ -124,7 +117,6 @@ gboolean cancel_all(gpointer data)
                else
                        thumbnail_util_error("thumbnail_util_cancel[%d] is failed", i);
        }
-#endif
        thumbnail_util_destroy(_media_thumb);
 
        return false;