summaryrefslogtreecommitdiffstats
path: root/plugins/phonesim.c
diff options
context:
space:
mode:
authorAndrzej Zaborowski <andrew.zaborowski@intel.com>2010-08-05 19:30:52 +0200
committerDenis Kenzior <denkenz@gmail.com>2010-08-06 11:53:27 -0500
commit303394910fb539683aee1b3da829a78035fb9e22 (patch)
tree3c79472d325205b79ced809783f32ea2244c5f60 /plugins/phonesim.c
parentf01de438bd4f834a27f9c36e74e6a1067f778a21 (diff)
downloadofono-303394910fb539683aee1b3da829a78035fb9e22.tar.bz2
phonesim: Don't use VENDOR_PHONESIM for calypso
Also move the STK initialisation to post-sim because it is more logical there (even if it makes no difference under phonesim).
Diffstat (limited to 'plugins/phonesim.c')
-rw-r--r--plugins/phonesim.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/phonesim.c b/plugins/phonesim.c
index 9c5b2cb7..97fa530f 100644
--- a/plugins/phonesim.c
+++ b/plugins/phonesim.c
@@ -289,8 +289,6 @@ static void phonesim_pre_sim(struct ofono_modem *modem)
else
ofono_voicecall_create(modem, 0, "atmodem", data->chat);
- ofono_stk_create(modem, OFONO_VENDOR_PHONESIM, "atmodem", data->chat);
-
if (sim)
ofono_sim_inserted_notify(sim, TRUE);
}
@@ -304,6 +302,10 @@ static void phonesim_post_sim(struct ofono_modem *modem)
DBG("%p", modem);
+ if (!data->calypso)
+ ofono_stk_create(modem, OFONO_VENDOR_PHONESIM,
+ "atmodem", data->chat);
+
ofono_ussd_create(modem, 0, "atmodem", data->chat);
ofono_call_forwarding_create(modem, 0, "atmodem", data->chat);
ofono_call_settings_create(modem, 0, "atmodem", data->chat);