second pass at XFree86 4.0 support

1 files changed, 1 insertions, 18 deletions

diff --git a/iw/mouse_gui.py b/iw/mouse_gui.py
index 6896bb070..9082111b8 100644
--- a/iw/mouse_gui.py
+++ b/iw/mouse_gui.py
@@ -6,7 +6,6 @@ from string import *
 from re import *
 import tree
 from translate import _
-import xmouse
 
 class MouseWindow (InstallWindow):
 
@@ -84,23 +83,7 @@ class MouseWindow (InstallWindow):
 	else:
 	    self.todo.mouse.setDevice(device)
 
-	cur = self.getCurrentKey()
-	(gpm, xdev, device, emulate) = self.availableMice[cur]
-
-        try:
-            curmouse = xmouse.get()
-        except RuntimeError:
-            # ignore errors when switching mice
-            return None
-        curmouse[0] = "/dev/" + device
-        # XXX
-        # IntelliMouse requires a full mouse reinit - X does not
-        # handle this properly from the mouse extention at this time
-        # so leave it alone
-        if not xdev == "IMPS/2" and not xdev == "IntelliMouse":
-            curmouse[1] = xdev
-        curmouse[6] = emulate
-        apply (xmouse.set, curmouse)
+        self.todo.mouse.setXProtocol ()
 
         return None