--- src/SFML/Window/Linux/JoystickImpl.cpp.orig	2013-07-21 11:30:08.000000000 +0400
+++ src/SFML/Window/Linux/JoystickImpl.cpp	2014-08-15 18:39:52.598031897 +0400
@@ -27,7 +27,6 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Window/JoystickImpl.hpp>
 #include <SFML/System/Err.hpp>
-#include <sys/inotify.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
@@ -45,7 +44,7 @@
         for (unsigned int i = 0; i < sf::Joystick::Count; ++i)
         {
             char name[32];
-            std::snprintf(name, sizeof(name), "/dev/input/js%u", i);
+            ::snprintf(name, sizeof(name), "/dev/input/js%u", i);
             struct stat info;
             plugged[i] = (stat(name, &info) == 0);
         }
@@ -70,185 +69,46 @@
 ////////////////////////////////////////////////////////////
 void JoystickImpl::initialize()
 {
-    // Reset the array of plugged joysticks
-    std::fill(plugged, plugged + Joystick::Count, false);
-
-    // Create the inotify instance
-    notifyFd = inotify_init();
-    if (notifyFd < 0)
-    {
-        err() << "Failed to initialize inotify, joystick connections and disconnections won't be notified" << std::endl;
-        return;
-    }
-
-    // Watch nodes created and deleted in the /dev/input directory
-    inputFd = inotify_add_watch(notifyFd, "/dev/input", IN_CREATE | IN_DELETE);
-    if (inputFd < 0)
-    {
-        err() << "Failed to initialize inotify, joystick connections and disconnections won't be notified" << std::endl;
-        return;
-    }
-
-    // Do an initial scan
-    updatePluggedList();
 }
 
 
 ////////////////////////////////////////////////////////////
 void JoystickImpl::cleanup()
 {
-    // Stop watching the /dev/input directory
-    if (inputFd >= 0)
-        inotify_rm_watch(notifyFd, inputFd);
-
-    // Close the inotify file descriptor
-    if (inputFd >= 0)
-        ::close(notifyFd);
 }
 
 
 ////////////////////////////////////////////////////////////
 bool JoystickImpl::isConnected(unsigned int index)
 {
-    // First check if new joysticks were added/removed since last update
-    if (canRead(notifyFd))
-    {
-        // Don't bother decomposing and interpreting the filename, just do a full scan
-        updatePluggedList();
-
-        // Flush all the pending events
-        while (canRead(notifyFd))
-        {
-            char buffer[128];
-            read(notifyFd, buffer, sizeof(buffer));
-        }
-	}
-
-    // Then check if the joystick is connected
-    return plugged[index];
+	return false;
 }
 
 
 ////////////////////////////////////////////////////////////
 bool JoystickImpl::open(unsigned int index)
 {
-    if (plugged[index])
-    {
-        char name[32];
-        std::snprintf(name, sizeof(name), "/dev/input/js%u", index);
-
-        // Open the joystick's file descriptor (read-only and non-blocking)
-        m_file = ::open(name, O_RDONLY | O_NONBLOCK);
-        if (m_file >= 0)
-        {
-            // Retrieve the axes mapping
-            ioctl(m_file, JSIOCGAXMAP, m_mapping);
-
-            // Reset the joystick state
-            m_state = JoystickState();
-
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    else
-    {
-        return false;
-    }
+	return false;
 }
 
 
 ////////////////////////////////////////////////////////////
 void JoystickImpl::close()
 {
-    ::close(m_file);
 }
 
 
 ////////////////////////////////////////////////////////////
 JoystickCaps JoystickImpl::getCapabilities() const
 {
-    JoystickCaps caps;
-
-    // Get the number of buttons
-    char buttonCount;
-    ioctl(m_file, JSIOCGBUTTONS, &buttonCount);
-    caps.buttonCount = buttonCount;
-    if (caps.buttonCount > Joystick::ButtonCount)
-        caps.buttonCount = Joystick::ButtonCount;
-
-    // Get the supported axes
-    char axesCount;
-    ioctl(m_file, JSIOCGAXES, &axesCount);
-    for (int i = 0; i < axesCount; ++i)
-    {
-        switch (m_mapping[i])
-        {
-            case ABS_X :        caps.axes[Joystick::X]    = true; break;
-            case ABS_Y :        caps.axes[Joystick::Y]    = true; break;
-            case ABS_Z :
-            case ABS_THROTTLE : caps.axes[Joystick::Z]    = true; break;
-            case ABS_RZ:
-            case ABS_RUDDER:    caps.axes[Joystick::R]    = true; break;
-            case ABS_RX :       caps.axes[Joystick::U]    = true; break;
-            case ABS_RY :       caps.axes[Joystick::V]    = true; break;
-            case ABS_HAT0X :    caps.axes[Joystick::PovX] = true; break;
-            case ABS_HAT0Y :    caps.axes[Joystick::PovY] = true; break;
-            default : break;
-        }
-    }
-
-    return caps;
+    return JoystickCaps();
 }
 
 
 ////////////////////////////////////////////////////////////
 JoystickState JoystickImpl::JoystickImpl::update()
 {
-    // pop events from the joystick file
-    js_event joyState;
-    while (read(m_file, &joyState, sizeof(joyState)) > 0)
-    {
-        switch (joyState.type & ~JS_EVENT_INIT)
-        {
-            // An axis was moved
-            case JS_EVENT_AXIS :
-            {
-                float value = joyState.value * 100.f / 32767.f;
-                switch (m_mapping[joyState.number])
-                {
-                    case ABS_X :        m_state.axes[Joystick::X]    = value; break;
-                    case ABS_Y :        m_state.axes[Joystick::Y]    = value; break;
-                    case ABS_Z :
-                    case ABS_THROTTLE : m_state.axes[Joystick::Z]    = value; break;
-                    case ABS_RZ:
-                    case ABS_RUDDER:    m_state.axes[Joystick::R]    = value; break;
-                    case ABS_RX :       m_state.axes[Joystick::U]    = value; break;
-                    case ABS_RY :       m_state.axes[Joystick::V]    = value; break;
-                    case ABS_HAT0X :    m_state.axes[Joystick::PovX] = value; break;
-                    case ABS_HAT0Y :    m_state.axes[Joystick::PovY] = value; break;
-                    default : break;
-                }
-                break;
-            }
-
-            // A button was pressed
-            case JS_EVENT_BUTTON :
-            {
-                if (joyState.number < Joystick::ButtonCount)
-                    m_state.buttons[joyState.number] = (joyState.value != 0);
-                break;
-            }
-        }
-    }
-
-    // Check the connection state of the joystick (read() fails with an error != EGAIN if it's no longer connected)
-    m_state.connected = (errno == EAGAIN);
-
-    return m_state;
+    return JoystickState();
 }
 
 } // namespace priv