Don't do XGrabButton by default - avoids a conflict with xstroke.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@682 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 3dd76ac3b050f4184a308683bc312152b93e110c..958ab0703fec35400daab34f85fd5824f71ea45e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-28 Bill Haneman <bill.haneman@sun.com>
+
+       * registryd/deviceeventcontroller.c:
+       (spi_dec_init_mouse_listener): Don't do XGrabButton, 
+       rely on timer-poll instead, to avoid conflict with 
+       xstroke.
+       
 2004-07-20  Bill Haneman <bill.haneman@sun.com>
 
        * configure.in: Revved to 1.5.3.

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 95640d81d624162ad0f3c178b042322beee27388..6529d863dedda78fb92dd29e326a3bba90bbbe5a 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -620,6 +620,7 @@ spi_dec_init_mouse_listener (SpiRegistry *registry)
   Display *display = spi_get_display ();
   g_timeout_add (100, spi_dec_poll_mouse_idle, registry);
 
+#ifdef GRAB_BUTTON
   if (display)
     {
       if (XGrabButton (display, AnyButton, AnyModifier,
@@ -636,6 +637,7 @@ spi_dec_init_mouse_listener (SpiRegistry *registry)
       fprintf (stderr, "mouse buttons grabbed\n");
 #endif
     }
+#endif
 }
 
 /**