depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-09-27 14:15:26 +00:00
Code Issues Releases Wiki Activity

mm-call: Sanitise disconnect messages

Browse source 
Clean up the disconnect messages so they make sense when presented to
the user.  Also add new state change reasons from ModemManager 1.10
and 1.12.

Fixes #90
This commit is contained in:
Bob Ham 2020-01-21 13:25:47 +00:00
parent 7d02dcbb66
commit dc9b7102de
3 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/control vendored
View file

@ -7,7 +7,7 @@ Build-Depends:
libhandy-0.0-dev (>= 0.0.10), libhandy-0.0-dev (>= 0.0.10),
libgtk-3-dev, libgtk-3-dev,
modemmanager-dev, modemmanager-dev,
libmm-glib-dev, libmm-glib-dev (>= 1.12.0),
libgsound-dev, libgsound-dev,
libpeas-dev, libpeas-dev,
libgom-1.0-dev, libgom-1.0-dev,

37
plugins/mm/calls-mm-call.c
View file

@ -119,13 +119,16 @@ static const struct CallsMMCallStateReasonMap STATE_REASON_MAP[] = {
#define row(ENUMVALUE,DESCRIPTION) \ #define row(ENUMVALUE,DESCRIPTION) \
{ MM_CALL_STATE_REASON_##ENUMVALUE, DESCRIPTION } \ { MM_CALL_STATE_REASON_##ENUMVALUE, DESCRIPTION } \
row (UNKNOWN, "Outgoing call created"), row (UNKNOWN, N_("Call disconnected (unknown reason)")),
row (OUTGOING_STARTED, "Outgoing call started"), row (OUTGOING_STARTED, N_("Outgoing call started")),
row (INCOMING_NEW, "Incoming call"), row (INCOMING_NEW, N_("New incoming call")),
row (ACCEPTED, "Call accepted"), row (ACCEPTED, N_("Call accepted")),
row (TERMINATED, "Call terminated"), row (TERMINATED, N_("Call ended")),
row (REFUSED_OR_BUSY, "Busy or call refused"), row (REFUSED_OR_BUSY, N_("Call disconnected (busy or call refused)")),
row (ERROR, "Wrong number or network problem"), row (ERROR, N_("Call disconnected (wrong number or network problem)")),
row (AUDIO_SETUP_FAILED, N_("Call disconnected (error setting up audio channel)")),
row (TRANSFERRED, N_("Call transferred")),
row (DEFLECTED, N_("Call deflected")),
#undef row #undef row
@ -137,25 +140,27 @@ set_disconnect_reason (CallsMMCall *self,
MMCallStateReason reason) MMCallStateReason reason)
{ {
const struct CallsMMCallStateReasonMap *map_row; const struct CallsMMCallStateReasonMap *map_row;
GString *reason_str;
if (self->disconnect_reason)
{
g_free (self->disconnect_reason);
}
for (map_row = STATE_REASON_MAP; map_row->desc; ++map_row) for (map_row = STATE_REASON_MAP; map_row->desc; ++map_row)
{ {
if (map_row->value == reason) if (map_row->value == reason)
{ {
self->disconnect_reason = g_strdup(map_row->desc); self->disconnect_reason =
g_strdup (gettext (map_row->desc));
return; return;
} }
} }
reason_str = g_string_new ("Unknown disconnect reason "); self->disconnect_reason =
g_string_append_printf (reason_str, "(%i)", (int)reason); g_strdup_printf (_("Call disconnected (unknown reason code %i)"),
(int)reason);
g_warning ("%s", reason_str->str); g_warning ("%s", self->disconnect_reason);
CALLS_SET_PTR_PROPERTY (self->disconnect_reason,
reason_str->str);
g_string_free (reason_str, FALSE);
} }

2
plugins/mm/meson.build
View file

@ -34,7 +34,7 @@ mm_deps = [
dependency('gobject-2.0'), dependency('gobject-2.0'),
dependency('gtk+-3.0'), dependency('gtk+-3.0'),
dependency('ModemManager'), dependency('ModemManager'),
dependency('mm-glib'), dependency('mm-glib', version: '>= 1.12.0'),
dependency('libpeas-1.0'), dependency('libpeas-1.0'),
] ]