From a2d710b0b68e21f14ef758b510409d0e56461406 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 19 Feb 2013 15:09:32 +0000
Subject: [PATCH] Ecore_x: Revert "don't filter out non-master pointers in
 xi2.2 support."

This actually breaks genlist selection.

This reverts commit 5adb2f1ae6766fb0880aba5a92fff4fa52d1402f.
---
 ChangeLog                          |  2 --
 NEWS                               |  1 -
 src/lib/ecore_x/xlib/ecore_x_xi2.c | 11 +++--------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53213c6b45..1aad83f212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,6 @@
 
         * Fix edje edje_color_class_list() and edje_text_class_list() to
         look at the correct hashes when returning.
-        * UIpdate ecore_x XI2.2 code to not filter out non-master
-        pointers.
 
 2013-02-17  Mike Blumenkrantz
 
diff --git a/NEWS b/NEWS
index e381784d8f..dc576ff4f9 100644
--- a/NEWS
+++ b/NEWS
@@ -111,7 +111,6 @@ Improvements:
     * eina: Eina_Tiler now take tile size into account.
     * edje: reduce memory consumption of Edje program handler.
     * eina, evas: improved support for 64bits system.
-    * don't filter out non-master pointers in XI2.2 support.
 
 Fixes:
     * Fix a memory leak in ecore_con_dns when using ecore_con_server_connect
diff --git a/src/lib/ecore_x/xlib/ecore_x_xi2.c b/src/lib/ecore_x/xlib/ecore_x_xi2.c
index db81f4b504..8289688f6f 100644
--- a/src/lib/ecore_x/xlib/ecore_x_xi2.c
+++ b/src/lib/ecore_x/xlib/ecore_x_xi2.c
@@ -438,9 +438,6 @@ ecore_x_input_multi_select(Ecore_X_Window win)
           }
         else if (dev->use == XISlavePointer)
           {
-/* disabled as this seems nto to be needed and never was successfully
- * tested anyway. leave this here commented out for a while to let people
- * whickly re-enable and see. should go away one day though.
              XIDeviceInfo *atdev = NULL;
              int j;
 
@@ -451,7 +448,6 @@ ecore_x_input_multi_select(Ecore_X_Window win)
                }
              if (((atdev) && (atdev->use != XIMasterPointer)) ||
                  (!atdev))
- */
                {
                   XIEventMask eventmask;
                   unsigned char mask[4] = { 0 };
@@ -486,11 +482,11 @@ ecore_x_input_multi_select(Ecore_X_Window win)
 # ifdef XI_TouchEnd
                   XISetMask(mask, XI_TouchEnd);
 # endif
-#endif
+#endif /* #ifdef ECORE_XI2_2 */
+
                   XISelectEvents(_ecore_x_disp, win, &eventmask, 1);
                   find = EINA_TRUE;
                }
-/* part of the above commented int - never tested/needed the if...
 #ifdef ECORE_XI2_2
              else if ((atdev) && (atdev->use == XIMasterPointer))
                {
@@ -518,8 +514,7 @@ ecore_x_input_multi_select(Ecore_X_Window win)
                        find = EINA_TRUE;
                     }
                }
-#endif
- */
+#endif /* #ifdef ECORE_XI2_2 */
           }
      }