diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2019-05-27 19:59:53 +0000 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2019-05-28 14:34:32 +0000 |
| commit | 033ce2d9560c7c606cedf196382620585be98b23 (patch) | |
| tree | 6e65a1c17b7437872139c84c70ea1518205037e1 | |
| parent | 2b47e894054eab0d9fdfcba6d9c1b0ae91bd9efc (diff) | |
| download | mutter-033ce2d9560c7c606cedf196382620585be98b23.tar.gz | |
input-mapper: Remove unnecessary return value
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
| -rw-r--r-- | src/backends/meta-input-mapper.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/backends/meta-input-mapper.c b/src/backends/meta-input-mapper.c index acc9b1618..fc4f3bd59 100644 --- a/src/backends/meta-input-mapper.c +++ b/src/backends/meta-input-mapper.c @@ -353,7 +353,7 @@ find_builtin_output (MetaInputMapper *mapper, return panel != NULL; } -static gboolean +static void guess_candidates (MetaInputMapper *mapper, MetaMapperInputInfo *input, DeviceCandidates *info) @@ -387,15 +387,7 @@ guess_candidates (MetaInputMapper *mapper, find_builtin_output (mapper, &info->candidates[META_MATCH_IS_BUILTIN]); } - if (best < N_OUTPUT_MATCHES) - { - info->best = best; - return TRUE; - } - else - { - return FALSE; - } + info->best = best; } static void @@ -408,8 +400,7 @@ mapping_helper_add (MappingHelper *helper, info.input = input; - if (!guess_candidates (mapper, input, &info)) - return; + guess_candidates (mapper, input, &info); for (i = 0; i < helper->device_maps->len; i++) { |