From e99ad3688971fde57cf34d4a9f5dd89256c7ab78 Mon Sep 17 00:00:00 2001
From: Matias Linares <matiaslina@openmailbox.org>
Date: Sun, 22 Nov 2015 20:07:01 -0300
Subject: Move the file descriptor of the socket to the select event.

---
 src/event.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/event.rs')

diff --git a/src/event.rs b/src/event.rs
index f683c63..6f5c427 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -32,6 +32,7 @@ use std::fmt;
 use std::ptr;
 use std::mem::uninitialized;
 use std::cmp::max;
+use std::os::unix::io::AsRawFd;
 
 use safe_x11::next_xevent;
 
@@ -73,13 +74,13 @@ impl fmt::Debug for Event {
     }
 }
 
-pub unsafe fn select_event(display: *mut Display, x11fd: c_int, socket_fd: c_int,
-                           listener: &UnixListener) -> Event {
+pub unsafe fn select_event(display: *mut Display, x11fd: c_int, listener: &UnixListener) -> Event {
     // Return right now if there're some XEvent on the queue
     if XPending(display) > 0 {
         return next_event(display);
     }
 
+    let socket_fd = listener.as_raw_fd();
     let mut read_fdset: fd_set = uninitialized();
 
     FD_ZERO(&mut read_fdset);
-- 
cgit v1.2.3-70-g09d2