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

[Sebastien Bacher]

Unmerged revisions

4045. By Alberto Milone on 2014-06-05

Revert changes to the changelog

4044. By Alberto Milone on 2014-06-05

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

Fixes LP: #1326636

4043. By Alberto Milone on 2014-06-05

Start work on 14.04.0+14.10.20140604-0ubuntu2

4042. By PS Jenkins bot on 2014-06-04

Releasing 14.04.0+14.10.20140604-0ubuntu1

4041. By Alberto Milone on 2014-06-04

gsd-xrandr-manager.c: add support for mapping the main touchscreen onto the main display

This makes sure that the touch input device knows exactly the
area that represents the display when the screen configuration
changes.

We give the highest priority to outputs that use an embedded
display connector such as LVDS or eDP. If no embedded connector
can be found, we try to match the size reported by the touch
input device with the size reported by the EDID of the display.

Note: this doesn't cover the tablet use case.

This is a partial backport of the upstream code. I haven't
backported the new device mapper, as that's something that
would be best handled with a full sync with upstream (it's
too much code to backport).

Fixes LP: #1287341

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-05 11:42:58 +0000
+++ debian/changelog	2014-06-05 11:42:58 +0000
@@ -1,4 +1,4 @@
-unity-settings-daemon (14.04.0+14.04.20140414-0ubuntu2) UNRELEASED; urgency=medium
+unity-settings-daemon (14.04.0+14.10.20140604-0ubuntu1) utopic; urgency=medium
 
   [ Alberto Milone ]
   * gsd-xrandr-manager.c:
@@ -15,7 +15,7 @@
       touchscreens. When we finally sync with the upstream code
       we can drop this.
 
- -- Alberto Milone <[e-mail]>  Fri, 23 May 2014 12:01:11 +0200
+ -- Ubuntu daily release <[e-mail]>  Wed, 04 Jun 2014 15:42:47 +0000
 
 unity-settings-daemon (14.04.0+14.04.20140414-0ubuntu1) trusty; urgency=low
 
 
=== modified file 'plugins/xrandr/gsd-xrandr-manager.c'
--- plugins/xrandr/gsd-xrandr-manager.c	2014-06-05 11:42:58 +0000
+++ plugins/xrandr/gsd-xrandr-manager.c	2014-06-05 11:42:58 +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);