backends: Update to new "output" setting for tablets/touchscreens

This commit is contained in:
Carlos Garnacho 2018-07-30 21:16:24 +02:00 committed by Georges Basile Stavracas Neto
parent d30301c00a
commit ffca9b999d

View File

@ -814,7 +814,7 @@ meta_input_settings_find_monitor (MetaInputSettings *input_settings,
gchar **edid; gchar **edid;
priv = meta_input_settings_get_instance_private (input_settings); priv = meta_input_settings_get_instance_private (input_settings);
edid = g_settings_get_strv (settings, "display"); edid = g_settings_get_strv (settings, "output");
n_values = g_strv_length (edid); n_values = g_strv_length (edid);
if (n_values != 3) if (n_values != 3)
@ -1157,7 +1157,7 @@ mapped_device_changed_cb (GSettings *settings,
const gchar *key, const gchar *key,
DeviceMappingInfo *info) DeviceMappingInfo *info)
{ {
if (strcmp (key, "display") == 0) if (strcmp (key, "output") == 0)
update_device_display (info->input_settings, settings, info->device); update_device_display (info->input_settings, settings, info->device);
else if (strcmp (key, "mapping") == 0) else if (strcmp (key, "mapping") == 0)
update_tablet_mapping (info->input_settings, settings, info->device); update_tablet_mapping (info->input_settings, settings, info->device);
@ -2071,7 +2071,7 @@ meta_input_settings_cycle_tablet_output (MetaInputSettings *input_settings,
edid[1] = ""; edid[1] = "";
edid[2] = ""; edid[2] = "";
} }
g_settings_set_strv (info->settings, "display", edid); g_settings_set_strv (info->settings, "output", edid);
meta_display_show_tablet_mapping_notification (meta_get_display (), meta_display_show_tablet_mapping_notification (meta_get_display (),
device, pretty_name); device, pretty_name);