From: taesub kim <taesub.kim@samsung.com>
Date: Mon, 3 Jul 2017 05:21:41 +0000 (+0000)
Subject: Merge "[connman]Remove org.freedesktop.hostname1 service from Tizen platform." into... 
X-Git-Tag: accepted/tizen/unified/20170710.154658~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cc28fa0b1818eef6e7d001decfc1aa37c966019;hp=740bd279dba86b886c76bf499b0926aec975b8b4;p=platform%2Fupstream%2Fconnman.git

Merge "[connman]Remove org.freedesktop.hostname1 service from Tizen platform." into tizen
---

diff --git a/src/main.c b/src/main.c
index 28e3edb..21ed25f 100755
--- a/src/main.c
+++ b/src/main.c
@@ -765,8 +765,8 @@ int main(int argc, char *argv[])
 	__connman_wispr_init();
 #if !defined TIZEN_EXT
 	__connman_rfkill_init();
-#endif
 	__connman_machine_init();
+#endif
 
 	g_free(option_config);
 	g_free(option_device);
@@ -778,8 +778,8 @@ int main(int argc, char *argv[])
 
 	g_source_remove(signal);
 
-	__connman_machine_cleanup();
 #if !defined TIZEN_EXT
+	__connman_machine_cleanup();
 	__connman_rfkill_cleanup();
 #endif
 	__connman_wispr_cleanup();