summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaesub kim <taesub.kim@samsung.com>2017-07-03 05:21:41 (GMT)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2017-07-03 05:21:41 (GMT)
commit2cc28fa0b1818eef6e7d001decfc1aa37c966019 (patch)
tree81c045702d9a77fbc3b93d6adcc2264759f6aebe
parent740bd279dba86b886c76bf499b0926aec975b8b4 (diff)
parent2ffde81f6d5dbd85dfd4845a2e0f4684858d9d76 (diff)
downloadconnman-2cc28fa0b1818eef6e7d001decfc1aa37c966019.zip
connman-2cc28fa0b1818eef6e7d001decfc1aa37c966019.tar.gz
connman-2cc28fa0b1818eef6e7d001decfc1aa37c966019.tar.bz2
Merge "[connman]Remove org.freedesktop.hostname1 service from Tizen platform." into tizen
-rwxr-xr-xsrc/main.c4
1 files changed, 2 insertions, 2 deletions
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();