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

backends: Simplify function arguments

Browse Source 
We just pass a device in order to check it with the seat pointer, we
can do without this.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403>
This commit is contained in:
Carlos Garnacho 2020-08-11 17:40:52 +02:00 committed by Marge Bot
parent c601a824e9
commit fe9092da19
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backends/meta-input-settings.c
View File

@ -1274,19 +1274,13 @@ pointer_a11y_dwell_direction_from_setting (MetaInputSettings *input_settings,
} }
static void static void
load_pointer_a11y_settings (MetaInputSettings *input_settings, load_pointer_a11y_settings (MetaInputSettings *input_settings)
ClutterInputDevice *device)
{ {
MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (input_settings); MetaInputSettingsPrivate *priv = meta_input_settings_get_instance_private (input_settings);
ClutterPointerA11ySettings pointer_a11y_settings; ClutterPointerA11ySettings pointer_a11y_settings;
ClutterInputDevice *core_pointer;
GDesktopMouseDwellMode dwell_mode; GDesktopMouseDwellMode dwell_mode;
guint i; guint i;
core_pointer = clutter_seat_get_pointer (priv->seat);
if (device && device != core_pointer)
return;
clutter_seat_get_pointer_a11y_settings (CLUTTER_SEAT (priv->seat), clutter_seat_get_pointer_a11y_settings (CLUTTER_SEAT (priv->seat),
&pointer_a11y_settings); &pointer_a11y_settings);
pointer_a11y_settings.controls = 0; pointer_a11y_settings.controls = 0;
@ -1331,7 +1325,7 @@ meta_input_mouse_a11y_settings_changed (GSettings *settings,
{ {
MetaInputSettings *input_settings = META_INPUT_SETTINGS (user_data); MetaInputSettings *input_settings = META_INPUT_SETTINGS (user_data);
load_pointer_a11y_settings (input_settings, NULL); load_pointer_a11y_settings (input_settings);
} }
static GSettings * static GSettings *
@ -1496,7 +1490,6 @@ apply_device_settings (MetaInputSettings *input_settings,
update_pointer_accel_profile (input_settings, update_pointer_accel_profile (input_settings,
priv->trackball_settings, priv->trackball_settings,
device); device);
load_pointer_a11y_settings (input_settings, device);
update_middle_click_emulation (input_settings, priv->mouse_settings, device); update_middle_click_emulation (input_settings, priv->mouse_settings, device);
update_middle_click_emulation (input_settings, priv->touchpad_settings, device); update_middle_click_emulation (input_settings, priv->touchpad_settings, device);
@ -1721,6 +1714,7 @@ meta_input_settings_constructed (GObject *object)
check_mappable_devices (input_settings); check_mappable_devices (input_settings);
load_keyboard_a11y_settings (input_settings); load_keyboard_a11y_settings (input_settings);
load_pointer_a11y_settings (input_settings);
} }
static void static void