[gtk/gtk-3-24: 1/3] wayland/cursor: Rename GdkWaylandCursor variable
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24: 1/3] wayland/cursor: Rename GdkWaylandCursor variable
- Date: Tue, 8 Jan 2019 18:11:40 +0000 (UTC)
commit d31107c4fecfb83e4f6265b4d0c32ac963ff4eba
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Tue Jan 8 18:23:52 2019 +0100
wayland/cursor: Rename GdkWaylandCursor variable
It was called "private" for some reason. Call it "wayland_cursor"
instead, as it's a GdkWaylandCursor, and also not private.
gdk/wayland/gdkcursor-wayland.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
index cc20bb14f7..33d81f9c43 100644
--- a/gdk/wayland/gdkcursor-wayland.c
+++ b/gdk/wayland/gdkcursor-wayland.c
@@ -336,43 +336,43 @@ _gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay *display,
const gchar *name,
guint scale)
{
- GdkWaylandCursor *private;
+ GdkWaylandCursor *wayland_cursor;
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
- private = g_hash_table_lookup (display_wayland->cursor_cache, name);
- if (private)
- return GDK_CURSOR (g_object_ref (private));
+ wayland_cursor = g_hash_table_lookup (display_wayland->cursor_cache, name);
+ if (wayland_cursor)
+ return GDK_CURSOR (g_object_ref (wayland_cursor));
- private = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
- "cursor-type", GDK_CURSOR_IS_PIXMAP,
- "display", display,
- NULL);
+ wayland_cursor = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
+ "cursor-type", GDK_CURSOR_IS_PIXMAP,
+ "display", display,
+ NULL);
/* Blank cursor case */
if (!name || g_str_equal (name, "none") || g_str_equal (name, "blank_cursor"))
{
- private->name = g_strdup ("none");
- private->scale = scale;
+ wayland_cursor->name = g_strdup ("none");
+ wayland_cursor->scale = scale;
- return GDK_CURSOR (private);
+ return GDK_CURSOR (wayland_cursor);
}
- private->name = g_strdup (name);
- private->scale = scale;
+ wayland_cursor->name = g_strdup (name);
+ wayland_cursor->scale = scale;
- if (!_gdk_wayland_cursor_update (display_wayland, private))
+ if (!_gdk_wayland_cursor_update (display_wayland, wayland_cursor))
{
- g_object_unref (private);
+ g_object_unref (wayland_cursor);
return NULL;
}
/* Insert into cache. */
g_hash_table_insert (display_wayland->cursor_cache,
- private->name,
- g_object_ref (private));
- return GDK_CURSOR (private);
+ wayland_cursor->name,
+ g_object_ref (wayland_cursor));
+ return GDK_CURSOR (wayland_cursor);
}
GdkCursor *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]