sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

voicecall: Fix ECC list generation for empty EFecc

This commit is contained in:
Denis Kenzior 2011-04-11 15:24:09 -05:00
parent d214427663
commit 857d2dfca8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/voicecall.c
View File

@ -40,6 +40,8 @@
#define MAX_VOICE_CALLS 16
#define VOICECALL_FLAG_SIM_ECC_READY 0x1
GSList *g_drivers = NULL;
struct ofono_voicecall {
@ -51,6 +53,7 @@ struct ofono_voicecall {
GSList *new_sim_en_list; /* Emergency numbers being read from SIM */
char **nw_en_list; /* Emergency numbers from modem/network */
DBusMessage *pending;
uint32_t flags;
struct ofono_sim *sim;
struct ofono_sim_context *sim_context;
unsigned int sim_watch;
@ -2201,7 +2204,7 @@ static void set_new_ecc(struct ofono_voicecall *vc)
add_to_en_list(vc, vc->nw_en_list);
/* Emergency numbers read from SIM */
if (vc->sim_en_list != NULL) {
if (vc->flags & VOICECALL_FLAG_SIM_ECC_READY) {
GSList *l;
for (l = vc->sim_en_list; l; l = l->next)
@ -2226,6 +2229,8 @@ static void free_sim_ecc_numbers(struct ofono_voicecall *vc, gboolean old_only)
g_slist_foreach(vc->sim_en_list, (GFunc) g_free, NULL);
g_slist_free(vc->sim_en_list);
vc->sim_en_list = NULL;
vc->flags &= ~VOICECALL_FLAG_SIM_ECC_READY;
}
if (vc->sim_en_list) {
@ -2264,6 +2269,8 @@ static void ecc_g2_read_cb(int ok, int total_length, int record,
g_strdup(en));
}
vc->flags |= VOICECALL_FLAG_SIM_ECC_READY;
set_new_ecc(vc);
}
@ -2303,6 +2310,8 @@ check:
vc->sim_en_list = vc->new_sim_en_list;
vc->new_sim_en_list = NULL;
vc->flags |= VOICECALL_FLAG_SIM_ECC_READY;
set_new_ecc(vc);
}