change terminology from calendar-svc to calendar-service

Change-Id: I92fddaebeb4e16a36f022fb15d7815fa96a9df43

diff --git a/build-util/generator.sh b/build-util/generator.sh
index 6c6a10c..ed5637c 100755 (executable)
--- a/build-util/generator.sh
+++ b/build-util/generator.sh
@@ -29,6 +29,6 @@ echo "static const char *schema_query = \"\\" > ../server/schema.h
 echo \"\; >> ../server/schema.h
 
 # Make DB file at builing time
-sqlite3 .calendar-svc.db < schema.sql
+sqlite3 .calendar-service.db < schema.sql
 
 make clean

diff --git a/common/cal_typedef.h b/common/cal_typedef.h
index 7b99fc7..caec6d2 100644 (file)
--- a/common/cal_typedef.h
+++ b/common/cal_typedef.h
@@ -35,9 +35,9 @@
 
 #define CAL_TZID_GMT "Etc/GMT"
 #define CAL_SOCK_PATH "/run/user/%d"
-#define CAL_NOTI_FILE_EVENT tzplatform_mkpath(TZ_USER_DATA, "calendar-svc/.CALENDAR_SVC_EVENT_CHANGED")
-#define CAL_NOTI_FILE_TODO tzplatform_mkpath(TZ_USER_DATA, "calendar-svc/.CALENDAR_SVC_TODO_CHANGED")
-#define CAL_NOTI_FILE_BOOK tzplatform_mkpath(TZ_USER_DATA, "calendar-svc/.CALENDAR_SVC_CALENDAR_CHANGED")
+#define CAL_NOTI_FILE_EVENT tzplatform_mkpath(TZ_USER_DATA, "calendar-service/.CALENDAR_SVC_EVENT_CHANGED")
+#define CAL_NOTI_FILE_TODO tzplatform_mkpath(TZ_USER_DATA, "calendar-service/.CALENDAR_SVC_TODO_CHANGED")
+#define CAL_NOTI_FILE_BOOK tzplatform_mkpath(TZ_USER_DATA, "calendar-service/.CALENDAR_SVC_CALENDAR_CHANGED")
 #define CAL_NOTI_REMINDER_CAHNGED "reminder"
 #define CAL_FORMAT_LOCAL_DATETIME "%04d-%02d-%02dT%02d:%02d:%02d"
 #define CAL_DATETIME_FORMAT_YYYYMMDD "%04d%02d%02d"

diff --git a/server/db/cal_db.h b/server/db/cal_db.h
index 32976b7..14ba810 100644 (file)
--- a/server/db/cal_db.h
+++ b/server/db/cal_db.h
@@ -24,11 +24,11 @@
 #include "calendar_view.h"
 #include "calendar_list.h"
 
-#define CALS_DB_NAME ".calendar-svc.db"
+#define CALS_DB_NAME ".calendar-service.db"
 #define DB_PATH tzplatform_getenv(TZ_USER_DB)
 #define DATA_PATH tzplatform_getenv(TZ_USER_DATA)
-#define CAL_DB_FILE tzplatform_mkpath(TZ_USER_DB, ".calendar-svc.db")
-#define CAL_DATA_PATH tzplatform_mkpath(TZ_USER_DATA, "calendar-svc")
+#define CAL_DB_FILE tzplatform_mkpath(TZ_USER_DB, ".calendar-service.db")
+#define CAL_DATA_PATH tzplatform_mkpath(TZ_USER_DATA, "calendar-service")
 
 /* For Security */
 #define CAL_SECURITY_FILE_GROUP 5000