brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input-mapper: Remove unnecessary return value

Browse Source 
Since commit ae6d9e35bd, there is a fallback to META_MATCH_IS_BUILTIN,
so the condition for returning FALSE is never met.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/598
This commit is contained in:
Florian Müllner 2019-05-27 19:59:53 +00:00 committed by Georges Basile Stavracas Neto
parent 2b47e89405
commit 033ce2d956
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backends/meta-input-mapper.c
View File

@ -353,7 +353,7 @@ find_builtin_output (MetaInputMapper *mapper,
return panel != NULL; return panel != NULL;
} }
static gboolean static void
guess_candidates (MetaInputMapper *mapper, guess_candidates (MetaInputMapper *mapper,
MetaMapperInputInfo *input, MetaMapperInputInfo *input,
DeviceCandidates *info) DeviceCandidates *info)
@ -387,15 +387,7 @@ guess_candidates (MetaInputMapper *mapper,
find_builtin_output (mapper, &info->candidates[META_MATCH_IS_BUILTIN]); find_builtin_output (mapper, &info->candidates[META_MATCH_IS_BUILTIN]);
} }
if (best < N_OUTPUT_MATCHES) info->best = best;
{
info->best = best;
return TRUE;
}
else
{
return FALSE;
}
} }
static void static void
@ -408,8 +400,7 @@ mapping_helper_add (MappingHelper *helper,
info.input = input; info.input = input;
if (!guess_candidates (mapper, input, &info)) guess_candidates (mapper, input, &info);
return;
for (i = 0; i < helper->device_maps->len; i++) for (i = 0; i < helper->device_maps->len; i++)
{ {