From 2fc978ca9dc867784f66b220e996e648f4d0d465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Fri, 27 Apr 2018 15:39:29 +0200
Subject: [PATCH] backends/cursor: Rename X11 cursor creation function

It was prefixed with meta_cursor_, but it took a X11 Display, so update
the naming. Eventually it should be duplicated depending if it's a
frontend X11 connection call or a backend X11 connection call and moved
to the corresponding layers, but let's just do this minor cleanup for
now.

https://gitlab.gnome.org/GNOME/mutter/issues/77
---
 src/backends/meta-cursor.c                  | 4 ++--
 src/backends/meta-cursor.h                  | 4 ++--
 src/backends/x11/meta-cursor-renderer-x11.c | 4 +++-
 src/core/display.c                          | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/backends/meta-cursor.c b/src/backends/meta-cursor.c
index abad3b5dd..ce0f20467 100644
--- a/src/backends/meta-cursor.c
+++ b/src/backends/meta-cursor.c
@@ -111,8 +111,8 @@ translate_meta_cursor (MetaCursor cursor)
 }
 
 Cursor
-meta_cursor_create_x_cursor (Display    *xdisplay,
-                             MetaCursor  cursor)
+meta_create_x_cursor (Display    *xdisplay,
+                      MetaCursor  cursor)
 {
   return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor));
 }
diff --git a/src/backends/meta-cursor.h b/src/backends/meta-cursor.h
index 1342a39ab..cd2ac1801 100644
--- a/src/backends/meta-cursor.h
+++ b/src/backends/meta-cursor.h
@@ -46,8 +46,8 @@ void meta_cursor_sprite_set_theme_scale (MetaCursorSprite *sprite,
 
 MetaCursor meta_cursor_sprite_get_meta_cursor (MetaCursorSprite *sprite);
 
-Cursor meta_cursor_create_x_cursor (Display    *xdisplay,
-                                    MetaCursor  cursor);
+Cursor meta_create_x_cursor (Display    *xdisplay,
+                             MetaCursor  cursor);
 
 void meta_cursor_sprite_prepare_at (MetaCursorSprite *sprite,
                                     int               x,
diff --git a/src/backends/x11/meta-cursor-renderer-x11.c b/src/backends/x11/meta-cursor-renderer-x11.c
index 82109f1f3..2b105cffb 100644
--- a/src/backends/x11/meta-cursor-renderer-x11.c
+++ b/src/backends/x11/meta-cursor-renderer-x11.c
@@ -65,7 +65,9 @@ meta_cursor_renderer_x11_update_cursor (MetaCursorRenderer *renderer,
 
       if (cursor != META_CURSOR_NONE)
         {
-          Cursor xcursor = meta_cursor_create_x_cursor (xdisplay, cursor);
+          Cursor xcursor;
+
+          xcursor = meta_create_x_cursor (xdisplay, cursor);
           XDefineCursor (xdisplay, xwindow, xcursor);
           XFlush (xdisplay);
           XFreeCursor (xdisplay, xcursor);
diff --git a/src/core/display.c b/src/core/display.c
index d6da84b30..e7dd4534b 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -3018,7 +3018,7 @@ Cursor
 meta_display_create_x_cursor (MetaDisplay *display,
                               MetaCursor   cursor)
 {
-  return meta_cursor_create_x_cursor (display->xdisplay, cursor);
+  return meta_create_x_cursor (display->xdisplay, cursor);
 }
 
 MetaGestureTracker *