From: InHong Han Date: Fri, 15 May 2020 11:20:55 +0000 (+0900) Subject: Change sticker directory to TZ_USER_SHARE X-Git-Tag: submit/tizen_5.5/20200515.113247~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54e45a83c8caca4af16e43b672f0a8140171fb0f;p=platform%2Fcore%2Fuifw%2Fcapi-ui-sticker.git Change sticker directory to TZ_USER_SHARE Change-Id: If2652a9659688a1638d4643e53081bbb16855395 --- diff --git a/client/sticker_dbus.c b/client/sticker_dbus.c index 6cf0088..ff54639 100644 --- a/client/sticker_dbus.c +++ b/client/sticker_dbus.c @@ -23,7 +23,7 @@ #endif #define LOG_TAG "STICKER_DBUS" -#define STICKER_DIRECTORY tzplatform_mkpath(TZ_SYS_SHARE, "sticker-data") +#define STICKER_DIRECTORY tzplatform_mkpath(TZ_USER_SHARE, "sticker-data") static int is_server_started = 0; static CLIENT_LIB last_req_lib = STICKER_CLIENT_LIB_NONE; diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 652ec6c..0f880c6 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -101,7 +101,7 @@ export FFLAGS+=" -DTIZEN_DEBUG_ENABLE -fvisibility=hidden" -DCOMPANION_MODE=true \ %endif -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DBINDIR=%{_bindir} -DINCLUDEDIR=%{_includedir} \ - -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -DTZ_SYS_BIN=%TZ_SYS_BIN -DTZ_SYS_SHARE=%TZ_SYS_SHARE \ + -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -DTZ_SYS_BIN=%TZ_SYS_BIN -DTZ_USER_SHARE=%TZ_USER_SHARE \ -DTZ_SYS_RO_APP=%TZ_SYS_RO_APP -DTZ_SYS_RO_PACKAGES=%TZ_SYS_RO_PACKAGES make %{?jobs:-j%jobs} @@ -142,10 +142,10 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj %post /sbin/ldconfig -mkdir -p -m 0775 %{TZ_SYS_SHARE}/sticker-data -chown -R ui_fw:ui_fw %{TZ_SYS_SHARE}/sticker-data -chsmack -t %{TZ_SYS_SHARE}/sticker-data -chsmack -a "System::Shared" %{TZ_SYS_SHARE}/sticker-data +mkdir -p -m 0775 %{TZ_USER_SHARE}/sticker-data +chown -R ui_fw:ui_fw %{TZ_USER_SHARE}/sticker-data +chsmack -t %{TZ_USER_SHARE}/sticker-data +chsmack -a "System::Shared" %{TZ_USER_SHARE}/sticker-data %postun -p /sbin/ldconfig diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c index c731971..60b1a22 100644 --- a/server/stickerd_data_manager.c +++ b/server/stickerd_data_manager.c @@ -39,7 +39,7 @@ #endif #define LOG_TAG "STICKERD_DATA_MANAGER" -#define STICKER_DIRECTORY tzplatform_mkpath(TZ_SYS_SHARE, "sticker-data") +#define STICKER_DIRECTORY tzplatform_mkpath(TZ_USER_SHARE, "sticker-data") #define MAX_ERROR_BUFFER 256 static GHashTable *_monitoring_hash = NULL; diff --git a/sticker-parser/sticker-parser.c b/sticker-parser/sticker-parser.c index a9c92ea..3b25fca 100644 --- a/sticker-parser/sticker-parser.c +++ b/sticker-parser/sticker-parser.c @@ -40,7 +40,7 @@ #endif #define LOG_TAG "STICKER_PARSER" -#define STICKER_DIRECTORY tzplatform_mkpath(TZ_SYS_SHARE, "sticker-data") +#define STICKER_DIRECTORY tzplatform_mkpath(TZ_USER_SHARE, "sticker-data") #define STICKER_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_info(sticker_info_id INTEGER PRIMARY KEY AUTOINCREMENT, app_id TEXT NOT NULL, type INTEGER NOT NULL, uri TEXT NOT NULL, thumbnail TEXT, description TEXT, group_name TEXT NOT NULL, date TEXT NOT NULL, display_type INTEGER)" #define STICKER_KEYWORD_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_keyword_info(keyword_id INTEGER PRIMARY KEY AUTOINCREMENT, sticker_info_id INTEGER, keyword TEXT NOT NULL, FOREIGN KEY (sticker_info_id) REFERENCES sticker_info(sticker_info_id) ON DELETE CASCADE)" #define STICKER_WHITELIST_INFO_CREATE_TABLE "CREATE TABLE IF NOT EXISTS sticker_whitelist_info(whitelist_id INTEGER PRIMARY KEY AUTOINCREMENT, provider_id TEXT NOT NULL, consumer_id TEXT NOT NULL)"