summaryrefslogtreecommitdiff
path: root/gdk/wayland/gdkselection-wayland.c
diff options
context:
space:
mode:
authorJonas Ã…dahl <jadahl@gmail.com>2016-04-26 11:16:56 +0800
committerMatthias Clasen <mclasen@redhat.com>2016-04-26 08:38:18 -0400
commitcb73becfb4cdb637bc8b19106a95f91482c95228 (patch)
treea602d513525021f842653b7e39a4c3c30b2384c8 /gdk/wayland/gdkselection-wayland.c
parent7700243bd49278692c8218fdf8358169672d7a13 (diff)
downloadgtk+-cb73becfb4cdb637bc8b19106a95f91482c95228.tar.gz
wayland: Clean up naming of GdkWaylandDisplay pointers
The naming of pointers to GdkWaylandDisplay's were inconsistent. Running the following commands in gtk+/gdk/wayland illustrate the inconsistency: $ grep -r '\<display_wayland\>' *.[ch] | wc -l 195 $ grep -r '\<wayland_display\>' *.[ch] | wc -l 81 This patch renames all occurrences of "wayland_display" to "display_wayland". This is also consistent with naming in the X11 backend. A couple of whitespace changes were done as well in places where the rename was already done, that added line breaks to long lines that stood out. https://bugzilla.gnome.org/show_bug.cgi?id=765474
Diffstat (limited to 'gdk/wayland/gdkselection-wayland.c')
-rw-r--r--gdk/wayland/gdkselection-wayland.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c
index d6555d54cd..69a2145e04 100644
--- a/gdk/wayland/gdkselection-wayland.c
+++ b/gdk/wayland/gdkselection-wayland.c
@@ -1453,7 +1453,7 @@ gboolean
gdk_wayland_selection_set_current_offer_actions (GdkDisplay *display,
uint32_t action)
{
- GdkWaylandDisplay *wayland_display = GDK_WAYLAND_DISPLAY (display);
+ GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
struct wl_data_offer *offer;
uint32_t all_actions = 0;
@@ -1467,7 +1467,7 @@ gdk_wayland_selection_set_current_offer_actions (GdkDisplay *display,
WL_DATA_DEVICE_MANAGER_DND_ACTION_MOVE |
WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK;
- if (wayland_display->data_device_manager_version >=
+ if (display_wayland->data_device_manager_version >=
WL_DATA_OFFER_SET_ACTIONS_SINCE_VERSION)
wl_data_offer_set_actions (offer, all_actions, action);
return TRUE;