modify terminology:calendar->book,allday->localtime,normal->utime,svc->service

[platform/core/pim/calendar-service.git] / common / dbus / cal_dbus_helper.c

diff --git a/common/dbus/cal_dbus_helper.c b/common/dbus/cal_dbus_helper.c
index ab835bb..a600f90 100644 (file)
--- a/common/dbus/cal_dbus_helper.c
+++ b/common/dbus/cal_dbus_helper.c
@@ -610,10 +610,10 @@ static GVariant *_todo_to_gvariant(calendar_record_h record)
        return value;
 }
 
-static GVariant *_instance_normal_to_gvariant(calendar_record_h record)
+static GVariant *_instance_utime_to_gvariant(calendar_record_h record)
 {
        GVariant *value = NULL;
-       cal_instance_normal_s *p = (cal_instance_normal_s *)record;
+       cal_instance_utime_s *p = (cal_instance_utime_s *)record;
 
        GVariant *arg_start = _caltime_to_gvariant(&p->start);
        GVariant *arg_end = _caltime_to_gvariant(&p->end);
@@ -629,10 +629,10 @@ static GVariant *_instance_normal_to_gvariant(calendar_record_h record)
        return value;
 }
 
-static GVariant *_instance_allday_to_gvariant(calendar_record_h record)
+static GVariant *_instance_localtime_to_gvariant(calendar_record_h record)
 {
        GVariant *value = NULL;
-       cal_instance_allday_s *p = (cal_instance_allday_s *)record;
+       cal_instance_localtime_s *p = (cal_instance_localtime_s *)record;
 
        GVariant *arg_start = _caltime_to_gvariant(&p->start);
        GVariant *arg_end = _caltime_to_gvariant(&p->end);
@@ -649,10 +649,10 @@ static GVariant *_instance_allday_to_gvariant(calendar_record_h record)
        return value;
 }
 
-static GVariant *_instance_normal_extended_to_gvariant(calendar_record_h record)
+static GVariant *_instance_utime_extended_to_gvariant(calendar_record_h record)
 {
        GVariant *value = NULL;
-       cal_instance_normal_extended_s *p = (cal_instance_normal_extended_s *)record;
+       cal_instance_utime_extended_s *p = (cal_instance_utime_extended_s *)record;
 
        GVariant *arg_start = _caltime_to_gvariant(&p->start);
        GVariant *arg_end = _caltime_to_gvariant(&p->end);
@@ -674,10 +674,10 @@ static GVariant *_instance_normal_extended_to_gvariant(calendar_record_h record)
        return value;
 }
 
-static GVariant *_instance_allday_extended_to_gvariant(calendar_record_h record)
+static GVariant *_instance_localtime_extended_to_gvariant(calendar_record_h record)
 {
        GVariant *value = NULL;
-       cal_instance_allday_extended_s *p = (cal_instance_allday_extended_s *)record;
+       cal_instance_localtime_extended_s *p = (cal_instance_localtime_extended_s *)record;
 
        GVariant *arg_start = _caltime_to_gvariant(&p->start);
        GVariant *arg_end = _caltime_to_gvariant(&p->end);
@@ -784,7 +784,7 @@ GVariant *cal_dbus_utils_record_to_gvariant(calendar_record_h record)
        }
 
        switch (type) {
-       case CAL_RECORD_TYPE_CALENDAR:
+       case CAL_RECORD_TYPE_BOOK:
                arg_record = _book_to_gvariant(record);
                break;
        case CAL_RECORD_TYPE_EVENT:
@@ -802,17 +802,17 @@ GVariant *cal_dbus_utils_record_to_gvariant(calendar_record_h record)
        case CAL_RECORD_TYPE_TIMEZONE:
                arg_record = _timezone_to_gvariant(record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL:
-               arg_record = _instance_normal_to_gvariant(record);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME:
+               arg_record = _instance_utime_to_gvariant(record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY:
-               arg_record = _instance_allday_to_gvariant(record);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME:
+               arg_record = _instance_localtime_to_gvariant(record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL_EXTENDED:
-               arg_record = _instance_normal_extended_to_gvariant(record);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED:
+               arg_record = _instance_utime_extended_to_gvariant(record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY_EXTENDED:
-               arg_record = _instance_allday_extended_to_gvariant(record);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED:
+               arg_record = _instance_localtime_extended_to_gvariant(record);
                break;
        case CAL_RECORD_TYPE_UPDATED_INFO:
                arg_record = _updated_info_to_gvariant(record);
@@ -1523,7 +1523,7 @@ static int _gvariant_to_todo(GVariant * arg_record, calendar_record_h *out_recor
 }
 
 
-static int _gvariant_to_instance_normal(GVariant * arg_record, calendar_record_h *out_record)
+static int _gvariant_to_instance_utime(GVariant * arg_record, calendar_record_h *out_record)
 {
        RETV_IF(NULL == arg_record, CALENDAR_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == out_record, CALENDAR_ERROR_INVALID_PARAMETER);
@@ -1532,7 +1532,7 @@ static int _gvariant_to_instance_normal(GVariant * arg_record, calendar_record_h
        calendar_record_create(_calendar_instance_utime_calendar_book._uri, &record);
        GVariant *arg_start = NULL;
        GVariant *arg_end = NULL;
-       cal_instance_normal_s *p = (cal_instance_normal_s *)record;
+       cal_instance_utime_s *p = (cal_instance_utime_s *)record;
        g_variant_get(arg_record, "(iiiviv&s&s&siiiiiddiix&s)",
                        &p->event_id, &p->calendar_id, &p->start.type, &arg_start, &p->end.type,
                        &arg_end, &p->summary, &p->description, &p->location, &p->busy_status,
@@ -1550,7 +1550,7 @@ static int _gvariant_to_instance_normal(GVariant * arg_record, calendar_record_h
        return CALENDAR_ERROR_NONE;
 }
 
-static int _gvariant_to_instance_allday(GVariant * arg_record, calendar_record_h *out_record)
+static int _gvariant_to_instance_localtime(GVariant * arg_record, calendar_record_h *out_record)
 {
        RETV_IF(NULL == arg_record, CALENDAR_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == out_record, CALENDAR_ERROR_INVALID_PARAMETER);
@@ -1559,7 +1559,7 @@ static int _gvariant_to_instance_allday(GVariant * arg_record, calendar_record_h
        calendar_record_create(_calendar_instance_localtime_calendar_book._uri, &record);
        GVariant *arg_start = NULL;
        GVariant *arg_end = NULL;
-       cal_instance_allday_s *p = (cal_instance_allday_s *)record;
+       cal_instance_localtime_s *p = (cal_instance_localtime_s *)record;
        g_variant_get(arg_record, "(iiiviv&s&s&siiiiiddiix&si)",
                        &p->event_id, &p->calendar_id, &p->start.type, &arg_start, &p->end.type,
                        &arg_end, &p->summary, &p->description, &p->location, &p->busy_status,
@@ -1577,7 +1577,7 @@ static int _gvariant_to_instance_allday(GVariant * arg_record, calendar_record_h
        return CALENDAR_ERROR_NONE;
 }
 
-static int _gvariant_to_instance_normal_extended(GVariant * arg_record, calendar_record_h *out_record)
+static int _gvariant_to_instance_utime_extended(GVariant * arg_record, calendar_record_h *out_record)
 {
        RETV_IF(NULL == arg_record, CALENDAR_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == out_record, CALENDAR_ERROR_INVALID_PARAMETER);
@@ -1586,7 +1586,7 @@ static int _gvariant_to_instance_normal_extended(GVariant * arg_record, calendar
        calendar_record_create(_calendar_instance_utime_calendar_book_extended._uri, &record);
        GVariant *arg_start = NULL;
        GVariant *arg_end = NULL;
-       cal_instance_normal_extended_s *p = (cal_instance_normal_extended_s *)record;
+       cal_instance_utime_extended_s *p = (cal_instance_utime_extended_s *)record;
        g_variant_get(arg_record, "(iiiviv&s&s&siiiiiddiix&s&si&s&s&s&s)",
                        &p->event_id, &p->calendar_id, &p->start.type, &arg_start, &p->end.type,
                        &arg_end, &p->summary, &p->description, &p->location, &p->busy_status,
@@ -1610,7 +1610,7 @@ static int _gvariant_to_instance_normal_extended(GVariant * arg_record, calendar
        return CALENDAR_ERROR_NONE;
 }
 
-static int _gvariant_to_instance_allday_extended(GVariant * arg_record, calendar_record_h *out_record)
+static int _gvariant_to_instance_localtime_extended(GVariant * arg_record, calendar_record_h *out_record)
 {
        RETV_IF(NULL == arg_record, CALENDAR_ERROR_INVALID_PARAMETER);
        RETV_IF(NULL == out_record, CALENDAR_ERROR_INVALID_PARAMETER);
@@ -1619,7 +1619,7 @@ static int _gvariant_to_instance_allday_extended(GVariant * arg_record, calendar
        calendar_record_create(_calendar_instance_localtime_calendar_book_extended._uri, &record);
        GVariant *arg_start = NULL;
        GVariant *arg_end = NULL;
-       cal_instance_allday_extended_s *p = (cal_instance_allday_extended_s *)record;
+       cal_instance_localtime_extended_s *p = (cal_instance_localtime_extended_s *)record;
        g_variant_get(arg_record, "(iiiviv&s&s&siiiiiddiix&s&si&s&s&s&s)",
                        &p->event_id, &p->calendar_id, &p->start.type, &arg_start, &p->end.type,
                        &arg_end, &p->summary, &p->description, &p->location, &p->busy_status,
@@ -1663,7 +1663,7 @@ static int _gvariant_to_record(int type, GVariant *arg_common, GVariant *arg_rec
 
        calendar_record_h record = NULL;
        switch (type) {
-       case CAL_RECORD_TYPE_CALENDAR:
+       case CAL_RECORD_TYPE_BOOK:
                _gvariant_to_book(arg_record, &record);
                break;
        case CAL_RECORD_TYPE_EVENT:
@@ -1681,17 +1681,17 @@ static int _gvariant_to_record(int type, GVariant *arg_common, GVariant *arg_rec
        case CAL_RECORD_TYPE_TIMEZONE:
                _gvariant_to_timezone(arg_record, &record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL:
-               _gvariant_to_instance_normal(arg_record, &record);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME:
+               _gvariant_to_instance_utime(arg_record, &record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY:
-               _gvariant_to_instance_allday(arg_record, &record);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME:
+               _gvariant_to_instance_localtime(arg_record, &record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_NORMAL_EXTENDED:
-               _gvariant_to_instance_normal_extended(arg_record, &record);
+       case CAL_RECORD_TYPE_INSTANCE_UTIME_EXTENDED:
+               _gvariant_to_instance_utime_extended(arg_record, &record);
                break;
-       case CAL_RECORD_TYPE_INSTANCE_ALLDAY_EXTENDED:
-               _gvariant_to_instance_allday_extended(arg_record, &record);
+       case CAL_RECORD_TYPE_INSTANCE_LOCALTIME_EXTENDED:
+               _gvariant_to_instance_localtime_extended(arg_record, &record);
                break;
        case CAL_RECORD_TYPE_UPDATED_INFO:
                _gvariant_to_updated_info(arg_record, &record);