xserver: Branch 'master'

[Adam Jackson]

 hw/xwayland/xwayland-cvt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6e3a6e30a6ac66942a0756a5d079993181f02e34
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Mar 17 14:39:45 2016 +0100

    xwayland: do not include frequency in mode name
    
    Some applications (e.g. using lwjgl) try to parse the output of the
    xrandr command and get confused with the mode name returned by Xwayland,
    because it contains "@[frequency]" (e.g. "1024x640 at 60.0Hz").
    
    Remove the @[frequency] part of the mode name to match what is found in
    usual mode names on regular X servers to please those applications.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94589
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Daniel Stone <daniels at collabora.com>

diff --git a/hw/xwayland/xwayland-cvt.c b/hw/xwayland/xwayland-cvt.c
index 3566559..9655e10 100644
--- a/hw/xwayland/xwayland-cvt.c
+++ b/hw/xwayland/xwayland-cvt.c
@@ -296,8 +296,8 @@ xwayland_cvt(int HDisplay, int VDisplay, float VRefresh, Bool Reduced,
     if (Interlaced)
         modeinfo.modeFlags |= RR_Interlace;
 
-    snprintf(name, sizeof name, "%dx%d@%.1fHz",
-             modeinfo.width, modeinfo.height, VRefresh);
+    snprintf(name, sizeof name, "%dx%d",
+             modeinfo.width, modeinfo.height);
     modeinfo.nameLength = strlen(name);
 
     return RRModeGet(&modeinfo, name);