diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/capi-content-media-content.spec | 4 | ||||
| -rwxr-xr-x | src/media_filter.c | 32 |
3 files changed, 4 insertions, 34 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a36aec6..c4a1aba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ ELSE() ENDIF(TIZEN_PRODUCT_TV) INCLUDE_DIRECTORIES(${INC_DIR}) -SET(dependents "dlog libmedia-service libmedia-utils capi-base-common capi-system-info vconf storage sqlite3") +SET(dependents "dlog glib-2.0 libmedia-service libmedia-utils capi-base-common capi-system-info storage sqlite3") SET(pc_dependents "capi-base-common") INCLUDE(FindPkgConfig) diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index 41d07df..8f785ef 100644 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -1,6 +1,6 @@ Name: capi-content-media-content Summary: A Media content library in Tizen Native API -Version: 0.4.20 +Version: 0.4.21 Release: 0 Group: Multimedia/API License: Apache-2.0 @@ -8,11 +8,11 @@ Source0: %{name}-%{version}.tar.gz Source1001: capi-content-media-content.manifest BuildRequires: cmake BuildRequires: pkgconfig(dlog) +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(capi-base-common) BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(libmedia-service) BuildRequires: pkgconfig(libmedia-utils) -BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(storage) BuildRequires: pkgconfig(sqlite3) diff --git a/src/media_filter.c b/src/media_filter.c index 7a7c13b..afb90d9 100755 --- a/src/media_filter.c +++ b/src/media_filter.c @@ -17,33 +17,6 @@ #include <media_info_private.h> #include <media_util_private.h> -#include <vconf.h> - -static bool __is_pinyin_needed(void) -{ - char *lang = NULL; - const char *china = "zh_CN"; - const char *hongkong = "zh_HK"; - int ret = FALSE; - - /*Check CSC first*/ - bool pinyin_support = FALSE; - media_svc_check_pinyin_support(&pinyin_support); - if (pinyin_support) { - /*Check Language Setting*/ - lang = vconf_get_str(VCONFKEY_LANGSET); - content_retvm_if(lang == NULL, ret, "Fail to get string of language set"); - - if ((strncmp(china, lang, strlen(china)) == 0) || - (strncmp(hongkong, lang, strlen(hongkong)) == 0)) { - ret = TRUE; - } - - SAFE_FREE(lang); - } - - return ret; -} static const char *__get_order_str(media_content_order_e order_enum) { @@ -65,10 +38,7 @@ static const char *__get_collate_str(media_content_collation_e collate_type) case MEDIA_CONTENT_COLLATE_RTRIM: return " COLLATE RTRIM "; case MEDIA_CONTENT_COLLATE_LOCALIZED: - if (__is_pinyin_needed()) - return " COLLATE NOCASE "; - else - return " COLLATE localized "; + return " COLLATE localized "; default: return " "; } |