|
[-]
[+]
|
Changed |
_service:tar_git:ofono.spec
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.66.tar.bz2/ofono/drivers/ril/ril_plugin.c
^
|
| @@ -1061,7 +1061,6 @@
slot->imeisv, ril_plugin_sim_state(slot),
slot->slot_flags);
sailfish_manager_set_cell_info(slot->handle, slot->cell_info);
- grilio_channel_set_enabled(slot->io, slot->handle->enabled);
/* Check if this was the last slot we were waiting for */
ril_plugin_check_if_started(plugin);
@@ -2147,9 +2146,7 @@
{
if (s->handle->enabled) {
ril_plugin_check_modem(s);
- grilio_channel_set_enabled(s->io, TRUE);
} else {
- grilio_channel_set_enabled(s->io, FALSE);
ril_plugin_shutdown_slot(s, FALSE);
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:ofono-1.66.tar.bz2/ofono/drivers/ril/ril_voicecall.c
^
|
| @@ -135,6 +135,7 @@
grilio_parser_get_int32(&rilp, &num);
for (i = 0; i < num; i++) {
struct ofono_call *call = g_new(struct ofono_call, 1);
+ struct ril_slot_config *config;
gint tmp;
ofono_call_init(call);
@@ -154,7 +155,7 @@
if (config->samsung_calldetails)
grilio_parser_get_int32(&rilp, NULL); /* Samsung CallDetails */
grilio_parser_get_int32(&rilp, NULL); /* isVoicePrivacy */
- if (!config->samsung_calldetails)
+ if (!config->samsung_calldetails) {
number = grilio_parser_get_utf8(&rilp);
if (number) {
strncpy(call->phone_number.number, number,
@@ -169,7 +170,7 @@
g_free(name);
}
grilio_parser_get_int32(&rilp, NULL); /* namePresentation */
- if (config->samsung_calldetails)
+ if (config->samsung_calldetails) {
number = grilio_parser_get_utf8(&rilp);
if (number) {
strncpy(call->phone_number.number, number,
@@ -561,6 +562,7 @@
void *data)
{
struct ril_voicecall *vd = ril_voicecall_get_data(vc);
+ struct ril_slot_config *config;
const char *phstr = phone_number_to_string(ph);
GRilIoRequest *req = grilio_request_new();
|
