Patch for multi-user architecture compliance.

The code has been chaged as per guidelines for Tizen-3.0 multi-user architecture.

Bug-Tizen: PTREL-314

Change-Id: Ib4462b2a85715f997b8754f32f9bc0eb9c4500d6
Signed-off-by: Amit Dharmapurikar <amit.vd@samsung.com>

diff --git a/alarm-manager.c b/alarm-manager.c
index 23e78e6..7edc414 100755 (executable)
--- a/alarm-manager.c
+++ b/alarm-manager.c
@@ -31,6 +31,7 @@
 #include<sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <tzplatform_config.h>
 
 #include<dbus/dbus.h>
 #include<dbus/dbus-glib-lowlevel.h>
@@ -2737,7 +2738,6 @@ static bool __initialize_dbus()
        return true;
 }
 
-#define ALARMMGR_DB_FILE "/opt/dbspace/.alarmmgr.db"
 sqlite3 *alarmmgr_db;
 #define QUERY_CREATE_TABLE_ALARMMGR "create table alarmmgr \
                                (alarm_id integer primary key,\
@@ -2766,16 +2766,22 @@ static bool __initialize_db()
 {
        char *error_message = NULL;
        int ret;
+       char *alarmmgr_db_file = NULL;
 
-       if (access("/opt/dbspace/.alarmmgr.db", F_OK) == 0) {
+       alarmmgr_db_file = tzplatform_mkpath(TZ_SYS_DB,".alarmmgr.db");
+
+       if(alarmmgr_db_file == NULL)
+               return false;
+
+       if (access(alarmmgr_db_file, F_OK) == 0) {
                ret =
-                   db_util_open(ALARMMGR_DB_FILE, &alarmmgr_db,
+                   db_util_open(alarmmgr_db_file, &alarmmgr_db,
                                 DB_UTIL_REGISTER_HOOK_METHOD);
 
                if (ret != SQLITE_OK) {
                        ALARM_MGR_EXCEPTION_PRINT(
                            "====>>>> connect menu_db [%s] failed!\n",
-                            ALARMMGR_DB_FILE);
+                            alarmmgr_db_file);
                        return false;
                }
 
@@ -2783,13 +2789,13 @@ static bool __initialize_db()
        }
 
        ret =
-           db_util_open(ALARMMGR_DB_FILE, &alarmmgr_db,
+           db_util_open(alarmmgr_db_file, &alarmmgr_db,
                         DB_UTIL_REGISTER_HOOK_METHOD);
 
        if (ret != SQLITE_OK) {
                ALARM_MGR_EXCEPTION_PRINT(
                    "====>>>> connect menu_db [%s] failed!\n",
-                    ALARMMGR_DB_FILE);
+                    alarmmgr_db_file);
                return false;
        }
 

diff --git a/configure.ac b/configure.ac
index 271eaa3..7d11b8e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,11 +35,11 @@ AC_SUBST(ALARM_CFLAGS)
 
 dnl AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 # Checks for libraries.
-PKG_CHECK_MODULES(ALARM_MANAGER, dbus-1 glib-2.0 dbus-glib-1 gobject-2.0 dlog security-server bundle appsvc)
+PKG_CHECK_MODULES(ALARM_MANAGER, dbus-1 glib-2.0 dbus-glib-1 gobject-2.0 dlog security-server bundle appsvc libtzplatform-config)
 AC_SUBST(ALARM_MANAGER_CFLAGS)
 AC_SUBST(ALARM_MANAGER_LIBS)
 
-PKG_CHECK_MODULES(ALARM_MANAGER_SERVER, dbus-1 glib-2.0 dbus-glib-1 pmapi dlog heynoti aul bundle security-server db-util appsvc)
+PKG_CHECK_MODULES(ALARM_MANAGER_SERVER, dbus-1 glib-2.0 dbus-glib-1 pmapi dlog heynoti aul bundle security-server db-util appsvc libtzplatform-config)
 AC_SUBST(ALARM_MANAGER_SERVER_CFLAGS)
 AC_SUBST(ALARM_MANAGER_SERVER_LIBS)
 

diff --git a/packaging/alarm-manager.spec b/packaging/alarm-manager.spec
index 80fe178..50bad0d 100644 (file)
--- a/packaging/alarm-manager.spec
+++ b/packaging/alarm-manager.spec
@@ -24,6 +24,7 @@ BuildRequires:  pkgconfig(pmapi)
 BuildRequires:  pkgconfig(security-server)
 BuildRequires:  pkgconfig(tapi)
 BuildRequires:  pkgconfig(vconf)
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
 Alarm Server and devel libraries