add version in link APIs

Change-Id: I950e345173a5ee6a0481937d96a52fea4b2b5602

diff --git a/client/cal_client_dbus.c b/client/cal_client_dbus.c
index 4022964bee23120b6136f94b4734674440171d9f..de4c456823a4220194bf037a99d911eae1230bdf 100644 (file)
--- a/client/cal_client_dbus.c
+++ b/client/cal_client_dbus.c
@@ -1028,11 +1028,13 @@ int cal_dbus_link_record(calendar_h handle, int base_id, int record_id)
        RETV_IF(base_id <= 0, CALENDAR_ERROR_INVALID_PARAMETER);
        RETV_IF(record_id <= 0, CALENDAR_ERROR_INVALID_PARAMETER);
 
-       int ret = 0;
        GError *error = NULL;
+       int ret = 0;
+       int version = 0;
+
        GVariant *arg_handle = cal_dbus_utils_handle_to_gvariant(handle);
        cal_dbus_call_link_record_sync(cal_dbus_object, arg_handle, base_id, record_id,
-                       &ret, NULL, &error);
+                       &ret, &version, NULL, &error);
        if (error) {
                /* LCOV_EXCL_START */
                ERR("cal_dbus_call_link_record() Fail[%s]",  error->message);
@@ -1045,6 +1047,8 @@ int cal_dbus_link_record(calendar_h handle, int base_id, int record_id)
                return ret;
                /* LCOV_EXCL_STOP */
        }
+       cal_client_handle_set_version(handle, version);
+
        return ret;
 }
 
@@ -1053,11 +1057,13 @@ int cal_dbus_unlink_record(calendar_h handle, int record_id)
        RETV_IF(NULL == handle, CALENDAR_ERROR_INVALID_PARAMETER);
        RETV_IF(record_id <= 0, CALENDAR_ERROR_INVALID_PARAMETER);
 
-       int ret = 0;
        GError *error = NULL;
+       int ret = 0;
+       int version = 0;
+
        GVariant *arg_handle = cal_dbus_utils_handle_to_gvariant(handle);
        cal_dbus_call_unlink_record_sync(cal_dbus_object, arg_handle, record_id,
-                       &ret, NULL, &error);
+                       &ret, &version, NULL, &error);
        if (error) {
                /* LCOV_EXCL_START */
                ERR("cal_dbus_call_unlink_record() Fail[%s]",  error->message);
@@ -1070,6 +1076,8 @@ int cal_dbus_unlink_record(calendar_h handle, int record_id)
                return ret;
                /* LCOV_EXCL_STOP */
        }
+       cal_client_handle_set_version(handle, version);
+
        return ret;
 }
 

diff --git a/common/dbus/cal_dbus.xml b/common/dbus/cal_dbus.xml
index 63b36cf57fc84cce1aafa0a15b2f2418533f9a00..d9f454165300b3fae4e39e687e96cef7354f0fa9 100644 (file)
--- a/common/dbus/cal_dbus.xml
+++ b/common/dbus/cal_dbus.xml
@@ -151,11 +151,13 @@
                        <arg type="i" name="base_id" direction="in"/>
                        <arg type="i" name="record_id" direction="in"/>
                        <arg type="i" name="ret" direction="out"/>
+                       <arg type="i" name="version" direction="out"/>
                </method>
                <method name="unlink_record">
                        <arg type="(ii)" name="handle" direction="in"/>
                        <arg type="i" name="record_id" direction="in"/>
                        <arg type="i" name="ret" direction="out"/>
+                       <arg type="i" name="version" direction="out"/>
                </method>
        </interface>
 </node>

diff --git a/server/cal_server_dbus.c b/server/cal_server_dbus.c
index 01ad2b30a1ae93a36918d01aabbf14de84a491c0..380d3e77837316d8730cf52975bd68bc33477226 100644 (file)
--- a/server/cal_server_dbus.c
+++ b/server/cal_server_dbus.c
@@ -524,8 +524,11 @@ static gboolean _handle_link_record(calDbus *object, GDBusMethodInvocation *invo
                GVariant *arg_handle, int base_id, int record_id)
 {
        int ret = 0;
+       int version = 0;
+
        ret = cal_db_link_record(base_id, record_id);
-       cal_dbus_complete_link_record(object, invocation, ret);
+       version = cal_db_util_get_transaction_ver();
+       cal_dbus_complete_link_record(object, invocation, ret, version);
 
        cal_server_ondemand_start();
        return TRUE;
@@ -535,8 +538,11 @@ static gboolean _handle_unlink_record(calDbus *object, GDBusMethodInvocation *in
                GVariant *arg_handle, int record_id)
 {
        int ret = 0;
+       int version = 0;
+
        ret = cal_db_unlink_record(record_id);
-       cal_dbus_complete_unlink_record(object, invocation, ret);
+       version = cal_db_util_get_transaction_ver();
+       cal_dbus_complete_unlink_record(object, invocation, ret, version);
 
        cal_server_ondemand_start();
        return TRUE;