gdk: Remove GdkDisplay from GdkEventPrivate

And add it to GdkEventAny.

diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
index 926463054cf2b5f1eb9e48e192739662ecc07d8c..2fb9cc8da78f80130ac99c5f4a37d9cb6b5aaa35 100644 (file)
--- a/gdk/gdkevents.c
+++ b/gdk/gdkevents.c
@@ -375,8 +375,6 @@ gdk_event_new (GdkEventType type)
     event_hash = g_hash_table_new (g_direct_hash, NULL);
 
   new_private = g_slice_new0 (GdkEventPrivate);
-  
-  new_private->display = NULL;
 
   g_hash_table_insert (event_hash, new_private, GUINT_TO_POINTER (1));
 
@@ -524,7 +522,6 @@ gdk_event_copy (const GdkEvent *event)
     {
       GdkEventPrivate *private = (GdkEventPrivate *)event;
 
-      new_private->display = private->display;
       g_set_object (&new_private->user_data, private->user_data);
     }
 
@@ -1761,25 +1758,14 @@ void
 gdk_event_set_display (GdkEvent   *event,
                        GdkDisplay *display)
 {
-  GdkEventPrivate *private;
-
-  g_return_if_fail (gdk_event_is_allocated (event));
-
-  private = (GdkEventPrivate *)event;
-
-  private->display = display;
+  event->any.display = display;
 }
 
 GdkDisplay *
 gdk_event_get_display (const GdkEvent *event)
 {
-  if (gdk_event_is_allocated (event))
-    {
-      GdkEventPrivate *private = (GdkEventPrivate *)event;
-
-      if (private->display)
-       return private->display;
-    }
+  if (event->any.display)
+    return event->any.display;
 
   if (event->any.window)
     return gdk_window_get_display (event->any.window);

diff --git a/gdk/gdkeventsprivate.h b/gdk/gdkeventsprivate.h
index 50931b88f9a4e415fa6e855cf74f58a78c0f5703..4a8762df00a5baabc13196d9473bdf4cb747530c 100644 (file)
--- a/gdk/gdkeventsprivate.h
+++ b/gdk/gdkeventsprivate.h
@@ -48,6 +48,7 @@ struct _GdkEventAny
   gint8 send_event;
   GdkDevice *device;
   GdkDevice *source_device;
+  GdkDisplay *display;
 };
 
 /**

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 6bba4d2354c1c80b1703a358e46102038c4b629e..84841143537ca39b8fff839af9f4b9cd4a8ed555 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -146,7 +146,6 @@ typedef enum
 struct _GdkEventPrivate
 {
   GdkEvent   event;
-  GdkDisplay *display;
   GObject *user_data;
 };