X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmain.c;h=000847d6692319e55989900a5cf93f44026dff25;hb=67a2843d9cdf1c961c98151fcb2224b2fbe3d03f;hp=3a5990b51dabcfd1df462728740fc2e8216def3d;hpb=ed776f9ab57e249da21b3bfd7da5848d2263c5b1;p=connman

diff --git a/src/main.c b/src/main.c
index 3a5990b..000847d 100644
--- 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);
 
@@ -144,6 +148,10 @@ int main(int argc, char *argv[])
 
 	__connman_manager_init(conn, option_compat);
 
+	__connman_profile_init(conn);
+
+	__connman_rtnl_init();
+
 	__connman_plugin_init();
 
 	g_free(option_device);
@@ -155,19 +163,23 @@ int main(int argc, char *argv[])
 
 	g_main_loop_run(main_loop);
 
-	__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();
 
-	g_dbus_cleanup_connection(conn);
+	dbus_connection_unref(conn);
 
 	g_main_loop_unref(main_loop);