From 02e163882aa368fbfe61fe025c8e034622c8220e Mon Sep 17 00:00:00 2001
From: Neil Roberts <neil@linux.intel.com>
Date: Thu, 29 Aug 2013 14:07:50 +0100
Subject: [PATCH] display: Rename meta_display_handle_event to
 meta_display_handle_xevent

The plan is to make a new version of meta_display_handle_event that
will accept Clutter events instead of X events and then gradually move
over the events to the new function and finally remove the X version.
---
 src/core/display-private.h | 4 ++--
 src/core/display.c         | 8 ++++----
 src/wayland/meta-wayland.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/core/display-private.h b/src/core/display-private.h
index 53f8a6f07..d3427f865 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -482,8 +482,8 @@ gboolean meta_display_modifiers_accelerator_activate (MetaDisplay *display);
 /* In above-tab-keycode.c */
 guint meta_display_get_above_tab_keycode (MetaDisplay *display);
 
-gboolean meta_display_handle_event (MetaDisplay *display,
-                                    XEvent      *event);
+gboolean meta_display_handle_xevent (MetaDisplay *display,
+                                     XEvent      *event);
 
 #ifdef HAVE_XI23
 gboolean meta_display_process_barrier_event (MetaDisplay    *display,
diff --git a/src/core/display.c b/src/core/display.c
index 74193f492..66ab0684c 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -2226,7 +2226,7 @@ reload_xkb_rules (MetaScreen  *screen)
 }
 
 /**
- * meta_display_handle_event:
+ * meta_display_handle_xevent:
  * @display: The MetaDisplay that events are coming from
  * @event: The event that just happened
  *
@@ -2239,8 +2239,8 @@ reload_xkb_rules (MetaScreen  *screen)
  * dealing with all the kinds of events that might turn up.
  */
 gboolean
-meta_display_handle_event (MetaDisplay *display,
-                           XEvent   *event)
+meta_display_handle_xevent (MetaDisplay *display,
+                            XEvent      *event)
 {
   MetaWindow *window;
   MetaWindow *property_for_window;
@@ -3240,7 +3240,7 @@ event_callback (XEvent  *event,
       event->xcookie.evtype == XI_Motion)
     return FALSE;
 
-  return meta_display_handle_event (display, event);
+  return meta_display_handle_xevent (display, event);
 }
 
 /* Return the window this has to do with, if any, rather
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 13bbb9a43..6577923cc 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -643,7 +643,7 @@ synthesize_motion_event (MetaWaylandCompositor *compositor,
   device_event.valuators.mask = NULL;
   device_event.valuators.values = NULL;
 
-  meta_display_handle_event (display, (XEvent *) &generic_event);
+  meta_display_handle_xevent (display, (XEvent *) &generic_event);
 }
 
 static void