Fix cleanup and unregistration procedures

[connman] / src / main.c

diff --git a/src/main.c b/src/main.c
index 87efa00..000847d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -43,7 +43,7 @@ static void sig_term(int sig)
        g_main_loop_quit(main_loop);
 }
 
-static void disconnect_callback(void *user_data)
+static void disconnect_callback(DBusConnection *conn, void *user_data)
 {
        DBG("D-Bus disconnect");
 
@@ -76,8 +76,10 @@ int main(int argc, char *argv[])
        DBusError err;
        struct sigaction sa;
 
+#ifdef NEED_THREADS
        if (g_thread_supported() == FALSE)
                g_thread_init(NULL);
+#endif
 
        context = g_option_context_new(NULL);
        g_option_context_add_main_entries(context, options, NULL);
@@ -108,10 +110,12 @@ int main(int argc, char *argv[])
 
        main_loop = g_main_loop_new(NULL, FALSE);
 
+#ifdef NEED_THREADS
        if (dbus_threads_init_default() == FALSE) {
                fprintf(stderr, "Can't init usage of threads\n");
                exit(1);
        }
+#endif
 
        dbus_error_init(&err);
 
@@ -159,19 +163,19 @@ int main(int argc, char *argv[])
 
        g_main_loop_run(main_loop);
 
-       __connman_rtnl_cleanup();
-
-       __connman_agent_cleanup();
+       __connman_plugin_cleanup();
 
-       __connman_element_cleanup();
+       __connman_rtnl_cleanup();
 
        __connman_profile_cleanup();
 
        __connman_manager_cleanup();
 
-       __connman_storage_cleanup();
+       __connman_agent_cleanup();
 
-       __connman_plugin_cleanup();
+       __connman_element_cleanup();
+
+       __connman_storage_cleanup();
 
        __connman_log_cleanup();