colin/gnome-calls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

best-match: Don't special case NULL best match

Browse Source 
We always get a valid best match, even for NULL or empty ids,
so there is no more need to special case it.
This commit is contained in:
Evangelos Ribeiro Tzaras
2023-04-10 10:55:55 +02:00
parent 830906f57a
commit 23ee0475dd
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/calls-best-match.c
View File

@@ -475,9 +475,6 @@ calls_best_match_get_primary_info (CallsBestMatch *self)
{ {
const char *name; const char *name;
if (!self)
goto anon;
g_return_val_if_fail (CALLS_IS_BEST_MATCH (self), NULL); g_return_val_if_fail (CALLS_IS_BEST_MATCH (self), NULL);
name = calls_best_match_get_name (self); name = calls_best_match_get_name (self);
@@ -487,7 +484,6 @@ calls_best_match_get_primary_info (CallsBestMatch *self)
if (self->phone_number) if (self->phone_number)
return self->phone_number; return self->phone_number;
anon:
return _("Anonymous caller"); return _("Anonymous caller");
} }
@@ -501,9 +497,6 @@ anon:
const char * const char *
calls_best_match_get_secondary_info (CallsBestMatch *self) calls_best_match_get_secondary_info (CallsBestMatch *self)
{ {
if (!self)
goto anon;
g_return_val_if_fail (CALLS_IS_BEST_MATCH (self), NULL); g_return_val_if_fail (CALLS_IS_BEST_MATCH (self), NULL);
if (self->matched_individual) if (self->matched_individual)
@@ -516,6 +509,5 @@ calls_best_match_get_secondary_info (CallsBestMatch *self)
* https://gitlab.gnome.org/GNOME/calls/-/issues/358 * https://gitlab.gnome.org/GNOME/calls/-/issues/358
*/ */
anon:
return ""; return "";
} }