xserver: Branch 'master'

[Adam Jackson]

 hw/xwayland/xwayland-shm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 544b4149268561d3d794aa540172831fa7550a20
Author: Jonas Ådahl <jadahl at gmail.com>
Date:   Fri Feb 19 15:08:12 2016 +0800

    xwayland: Prefix shm tmp file names with xwayland
    
    Prefix the temporary file names used for allocating pixmaps with
    "xwayland-" instead of "weston-". This makes it less confusing while
    looking at the file names of the currently open fds of the Xwayland
    process.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jonas Ådahl <jadahl at gmail.com>

diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
index 1b388f0..1beade9 100644
--- a/hw/xwayland/xwayland-shm.c
+++ b/hw/xwayland/xwayland-shm.c
@@ -109,7 +109,7 @@ create_tmpfile_cloexec(char *tmpname)
 static int
 os_create_anonymous_file(off_t size)
 {
-    static const char template[] = "/weston-shared-XXXXXX";
+    static const char template[] = "/xwayland-shared-XXXXXX";
     const char *path;
     char *name;
     int fd;