Merge lp:~albertomilone/unity-settings-daemon/1326636-14.10 into lp:unity-settings-daemon

[Alberto Milone]

gsd-xrandr-manager.c: do not try to map an invalid touch device on initialisation

    Fixes LP: #1326636

gsd-xrandr-manager.c: do not try to map an invalid touch device on initialisation

Fixes LP: #1326636

[lp:~albertomilone/unity-settings-daemon/1326636-14.10]

4045. By Alberto Milone on 2014-06-05

Revert changes to the changelog

[Sebastien Bacher (seb128)]

thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4045
http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-settings-daemon-utopic-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-settings-daemon-ci/29/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/xrandr/gsd-xrandr-manager.c'
--- plugins/xrandr/gsd-xrandr-manager.c	2014-06-04 14:08:05 +0000
+++ plugins/xrandr/gsd-xrandr-manager.c	2014-06-05 09:57:50 +0000
@@ -2286,7 +2286,8 @@
 
         /* Initialise touchscreen mapping */
         set_touchscreen_id (manager);
-        do_touchscreen_mapping (manager);
+        if (manager->priv->main_touchscreen_id != -1)
+                do_touchscreen_mapping (manager);
 
         log_msg ("State of screen after initial configuration:\n");
         log_screen (manager->priv->rw_screen);