---
 src/voicecall.c |   70 +++++++++++++++++++++++++++---------------------------
 1 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/voicecall.c b/src/voicecall.c
index bd64432..3af614b 100644
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -2202,6 +2202,41 @@ static void sim_watch(struct ofono_atom *atom,
        sim_state_watch(ofono_sim_get_state(sim), vc);
 }
 
+static void dial_request_cb(const struct ofono_error *error, void *data)
+{
+       struct ofono_voicecall *vc = data;
+       gboolean need_to_emit;
+       struct voicecall *v;
+
+       v = dial_handle_result(vc, error,
+                               phone_number_to_string(&vc->dial_req->ph),
+                               &need_to_emit);
+
+       if (v == NULL) {
+               dial_request_finish(vc);
+               return;
+       }
+
+       v->message = vc->dial_req->message;
+       v->icon_id = vc->dial_req->icon_id;
+
+       vc->dial_req->message = NULL;
+       vc->dial_req->call = v;
+
+       /*
+        * TS 102 223 Section 6.4.13: The terminal shall not store
+        * in the UICC the call set-up details (called party number
+        * and associated parameters)
+        */
+       v->untracked = TRUE;
+
+       if (v->call->status == CALL_STATUS_ACTIVE)
+               dial_request_finish(vc);
+
+       if (need_to_emit)
+               voicecalls_emit_call_added(vc, v);
+}
+
 void ofono_voicecall_register(struct ofono_voicecall *vc)
 {
        DBusConnection *conn = ofono_dbus_get_connection();
@@ -2294,41 +2329,6 @@ ofono_bool_t __ofono_voicecall_is_busy(struct 
ofono_voicecall *vc,
        return TRUE;
 }
 
-static void dial_request_cb(const struct ofono_error *error, void *data)
-{
-       struct ofono_voicecall *vc = data;
-       gboolean need_to_emit;
-       struct voicecall *v;
-
-       v = dial_handle_result(vc, error,
-                               phone_number_to_string(&vc->dial_req->ph),
-                               &need_to_emit);
-
-       if (v == NULL) {
-               dial_request_finish(vc);
-               return;
-       }
-
-       v->message = vc->dial_req->message;
-       v->icon_id = vc->dial_req->icon_id;
-
-       vc->dial_req->message = NULL;
-       vc->dial_req->call = v;
-
-       /*
-        * TS 102 223 Section 6.4.13: The terminal shall not store
-        * in the UICC the call set-up details (called party number
-        * and associated parameters)
-        */
-       v->untracked = TRUE;
-
-       if (v->call->status == CALL_STATUS_ACTIVE)
-               dial_request_finish(vc);
-
-       if (need_to_emit)
-               voicecalls_emit_call_added(vc, v);
-}
-
 static void dial_request(struct ofono_voicecall *vc)
 {
        vc->driver->dial(vc, &vc->dial_req->ph, OFONO_CLIR_OPTION_DEFAULT,
-- 
1.7.0.4

_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono

Reply via email to