[gnome-settings-daemon] common: Ensure mapped devices have a system/screen integration

[Carlos Garnacho <carlosg src gnome org>]

commit e7f2134f24c527b113570cc8d52390561dc2a6fd
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sat Jun 25 10:47:17 2016 +0200

    common: Ensure mapped devices have a system/screen integration
    
    This will be true for touchscreens and integrated tablets. Tablets
    that have no touchscreen must not be handled by the GsdDeviceMapper,
    those are rather mapped on demand, by either g-c-c or the "switch
    monitor" pad button action.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=773958

 plugins/common/gsd-device-mapper.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/plugins/common/gsd-device-mapper.c b/plugins/common/gsd-device-mapper.c
index db3b6df..0ae4099 100644
--- a/plugins/common/gsd-device-mapper.c
+++ b/plugins/common/gsd-device-mapper.c
@@ -703,6 +703,10 @@ input_info_update_settings_output (GsdInputInfo *info)
        if (!info->settings || !info->mapper->rr_screen)
                return;
 
+       if ((info->capabilities &
+           (GSD_INPUT_IS_SCREEN_INTEGRATED | GSD_INPUT_IS_SYSTEM_INTEGRATED)) == 0)
+               return;
+
        rr_output = settings_get_display (info->settings, info->mapper);
 
        if (rr_output)