sync code with tizen_3.0 branch

Change-Id: Ide3f17a369a8f4a45041404134520c0fc03e6135
Signed-off-by: Ickhee Woo <ickhee.woo@samsung.com>

diff --git a/packaging/sync-manager.spec b/packaging/sync-manager.spec
index 7006604b24c92fb4cc90ca90f1e5dc652bafa3a3..992b5d44b5df8e5c74512b5ec562c82c8e2a304a 100644 (file)
--- a/packaging/sync-manager.spec
+++ b/packaging/sync-manager.spec
@@ -1,5 +1,5 @@
 Name:      sync-service
-Version:   0.1.7
+Version:   0.1.9
 Release:   1
 License:   Apache-2.0
 Summary:   Sync manager daemon

diff --git a/src/sync-service/SyncManager_SyncService.cpp b/src/sync-service/SyncManager_SyncService.cpp
index 23e91eb4b63e83707fe95ba8d03174154816ba7f..751baf5903caf0a297e520a4cc0f548ecea6eb22 100644 (file)
--- a/src/sync-service/SyncManager_SyncService.cpp
+++ b/src/sync-service/SyncManager_SyncService.cpp
@@ -136,6 +136,8 @@ SyncService::StartService() {
                }
        }
 
+       cynara_configuration_destroy(p_conf);
+
        return 0;
 }
 
@@ -589,7 +591,7 @@ get_service_name_by_pid(guint pid, char** pAppId) {
                                                                                                                                                -1,
                                                                                                                                                NULL,
                                                                                                                                                &error);
-               if (error) {
+               if (error || !service) {
                        LOG_LOGC("get_service_name_by_pid gdbus error [%s]", error->message);
                        *pAppId = NULL;
                        g_clear_error(&error);