Fix the feature name

- The default user feature is changed to
TIZEN_FEATURE_DEFAULT_USER.

Change-Id: I0b62da9cb817d2ebeec5084db24d9ea0fffc4ef7
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 507daaa..f814a5c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,9 +20,9 @@ ENDIF (with_wayland)
 IF (with_x11)
        pkg_check_modules(libpkgs REQUIRED ${AUL-1_LIB_PKG_CHECK_MODULES})
 ENDIF (with_x11)
-IF(_APPFW_FEATURE_DEFAULT_USER)
-       ADD_DEFINITIONS("-D_APPFW_FEATURE_DEFAULT_USER")
-ENDIF(_APPFW_FEATURE_DEFAULT_USER)
+IF(TIZEN_FEATURE_DEFAULT_USER)
+       ADD_DEFINITIONS("-DTIZEN_FEATURE_DEFAULT_USER")
+ENDIF(TIZEN_FEATURE_DEFAULT_USER)
 FOREACH(flag ${libpkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)

diff --git a/packaging/aul.spec b/packaging/aul.spec
index a80a2da..ea5db72 100644 (file)
--- a/packaging/aul.spec
+++ b/packaging/aul.spec
@@ -39,9 +39,9 @@ BuildRequires:  pkgconfig(libxml-2.0)
 %endif
 
 %if "%{?profile}" == "tv"
-%define appfw_feature_default_user 1
+%define tizen_feature_default_user 1
 %else
-%define appfw_feature_default_user 0
+%define tizen_feature_default_user 0
 %endif
 
 %description
@@ -73,8 +73,8 @@ cp %{SOURCE1001} .
 CFLAGS="%{optflags} -D__emul__"; export CFLAGS
 %endif
 
-%if 0%{?appfw_feature_default_user}
-_APPFW_FEATURE_DEFAULT_USER=ON
+%if 0%{?tizen_feature_default_user}
+TIZEN_FEATURE_DEFAULT_USER=ON
 %endif
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
@@ -86,7 +86,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %if %{with x}
        -Dwith_x11=TRUE \
 %endif
-       -D_APPFW_FEATURE_DEFAULT_USER:BOOL=${_APPFW_FEATURE_DEFAULT_USER} \
+       -DTIZEN_FEATURE_DEFAULT_USER:BOOL=${TIZEN_FEATURE_DEFAULT_USER} \
        .
 
 %__make %{?_smp_mflags}

diff --git a/src/aul_sock.c b/src/aul_sock.c
index 4cf5fe2..c927037 100644 (file)
--- a/src/aul_sock.c
+++ b/src/aul_sock.c
@@ -23,7 +23,7 @@
 #include <sys/xattr.h>
 #include <errno.h>
 #include <fcntl.h>
-#ifdef _APPFW_FEATURE_DEFAULT_USER
+#ifdef TIZEN_FEATURE_DEFAULT_USER
 #include <tzplatform_config.h>
 #endif
 
@@ -33,7 +33,7 @@
 
 #define MAX_NR_OF_DESCRIPTORS 2
 
-#ifdef _APPFW_FEATURE_DEFAULT_USER
+#ifdef TIZEN_FEATURE_DEFAULT_USER
 #define REGULAR_UID_MIN 5000
 static uid_t default_uid;
 static int default_uid_initialized;
@@ -164,7 +164,7 @@ static int __create_client_sock(int pid, uid_t uid)
                }
        }
 
-#ifdef _APPFW_FEATURE_DEFAULT_USER
+#ifdef TIZEN_FEATURE_DEFAULT_USER
        if (uid < REGULAR_UID_MIN) {
                if (!default_uid_initialized) {
                        default_uid = tzplatform_getuid(TZ_SYS_DEFAULT_USER);
@@ -658,7 +658,7 @@ int aul_sock_create_launchpad_client(const char *pad_type, uid_t uid)
                }
        }
 
-#ifdef _APPFW_FEATURE_DEFAULT_USER
+#ifdef TIZEN_FEATURE_DEFAULT_USER
        if (uid < REGULAR_UID_MIN) {
                if (!default_uid_initialized) {
                        default_uid = tzplatform_getuid(TZ_SYS_DEFAULT_USER);

diff --git a/tool/app_launcher.c b/tool/app_launcher.c
index 2a4c469..f7ddf53 100644 (file)
--- a/tool/app_launcher.c
+++ b/tool/app_launcher.c
@@ -34,7 +34,7 @@
 #include <pkgmgr-info.h>
 #include <bundle.h>
 #include <bundle_internal.h>
-#ifdef _APPFW_FEATURE_DEFAULT_USER
+#ifdef TIZEN_FEATURE_DEFAULT_USER
 #include <tzplatform_config.h>
 #endif
 
@@ -46,7 +46,7 @@
 #define LAUNCHPAD_PROCESS_POOL_SOCK ".launchpad-process-pool-sock"
 #define APP_TYPE_UI "uiapp"
 #define APP_TYPE_SERVICE "svcapp"
-#ifdef _APPFW_FEATURE_DEFAULT_USER
+#ifdef TIZEN_FEATURE_DEFAULT_USER
 #define REGULAR_UID_MIN 5000
 #endif
 #define INOTIFY_BUF (1024 * ((sizeof(struct inotify_event)) + 16))
@@ -648,7 +648,7 @@ int main(int argc, char **argv)
        if (argc == 1)
                print_usage(argv[0]);
 
-#ifdef _APPFW_FEATURE_DEFAULT_USER
+#ifdef TIZEN_FEATURE_DEFAULT_USER
        if (uid < REGULAR_UID_MIN)
                uid = tzplatform_getuid(TZ_SYS_DEFAULT_USER);
 #endif