From 58c761792860bfd2850228b1db9f0721ed099e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Fri, 26 Jul 2013 13:46:06 +0200
Subject: [PATCH] Enable map request event handling in Client

---
 client.h   | 2 +-
 events.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client.h b/client.h
index 70c2735d9b..7178fb22ed 100644
--- a/client.h
+++ b/client.h
@@ -672,7 +672,7 @@ private:
     void updateCursor();
 
     // Handlers for X11 events
-    bool mapRequestEvent(XMapRequestEvent* e);
+    bool mapRequestEvent(xcb_map_request_event_t *e);
     void unmapNotifyEvent(xcb_unmap_notify_event_t *e);
     void destroyNotifyEvent(xcb_destroy_notify_event_t *e);
     void configureRequestEvent(XConfigureRequestEvent* e);
diff --git a/events.cpp b/events.cpp
index 7c68ff8372..bbd32d876f 100644
--- a/events.cpp
+++ b/events.cpp
@@ -500,10 +500,10 @@ bool Client::windowEvent(xcb_generic_event_t *e)
     case XCB_DESTROY_NOTIFY:
         destroyNotifyEvent(reinterpret_cast<xcb_destroy_notify_event_t*>(e));
         break;
-#if KWIN_QT5_PORTING
-    case MapRequest:
+    case XCB_MAP_REQUEST:
         // this one may pass the event to workspace
-        return mapRequestEvent(&e->xmaprequest);
+        return mapRequestEvent(reinterpret_cast<xcb_map_request_event_t*>(e));
+#if KWIN_QT5_PORTING
     case ConfigureRequest:
         configureRequestEvent(&e->xconfigurerequest);
         break;
@@ -588,7 +588,7 @@ bool Client::windowEvent(xcb_generic_event_t *e)
 /*!
   Handles map requests of the client window
  */
-bool Client::mapRequestEvent(XMapRequestEvent* e)
+bool Client::mapRequestEvent(xcb_map_request_event_t *e)
 {
     if (e->window != window()) {
         // Special support for the save-set feature, which is a bit broken.