From 5b6b35cc5ab199938353c09be0f3455a4a5bd9b0 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Wed, 26 Sep 2012 10:45:38 +0200 Subject: [PATCH] session: Move get config calls after basic session initialization The config call will need some context later on. Therefore, create and initializate with the owner and add the watch on the ownership before we ask the policy plugin for any configuration. --- src/session.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/session.c b/src/session.c index 1cd34100..6e7ea4d8 100644 --- a/src/session.c +++ b/src/session.c @@ -1576,17 +1576,18 @@ int __connman_session_create(DBusMessage *msg) info = session->info; info_last = session->info_last; - policy_get_bool(session, owner, "Priority", &priority); - policy_get_bool(session, owner, "EmergencyCall", &ecall_app); - policy_get_string(session, owner, "RoamingPolicy", &roaming_policy_str); - roaming_policy = string2roamingpolicy(roaming_policy_str); - session->owner = g_strdup(owner); session->session_path = session_path; session->notify_path = g_strdup(notify_path); session->notify_watch = g_dbus_add_disconnect_watch(connection, session->owner, owner_disconnect, session, NULL); + + policy_get_bool(session, owner, "Priority", &priority); + policy_get_bool(session, owner, "EmergencyCall", &ecall_app); + policy_get_string(session, owner, "RoamingPolicy", &roaming_policy_str); + roaming_policy = string2roamingpolicy(roaming_policy_str); + if (ecall_app == TRUE) ecall_session = session; -- 2.34.1