summaryrefslogtreecommitdiff
path: root/src/session.cpp
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2008-08-21 00:51:03 +0200
committerDennis kasprzyk <onestone@compiz-fusion.org>2008-08-21 00:51:03 +0200
commitb0a83124e3668296b5db42ee5eff3ecf674d8d6a (patch)
treee7e7d686d3a4bb33f9a434c256ed742d493afca7 /src/session.cpp
parent3808dcc20b40c441f2c3b72bba151a6404d1f322 (diff)
downloadunity-window-decorator-b0a83124e3668296b5db42ee5eff3ecf674d8d6a.tar.gz
unity-window-decorator-b0a83124e3668296b5db42ee5eff3ecf674d8d6a.tar.bz2
Cleanup compiz[-core].h
Diffstat (limited to 'src/session.cpp')
-rw-r--r--src/session.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/session.cpp b/src/session.cpp
index 6efb27a..6c0a223 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -27,6 +27,8 @@
# include "../config.h"
#endif
+#include <compiz.h>
+
#include <stdlib.h>
#include <stdio.h>
#include <poll.h>
@@ -36,6 +38,8 @@
#include <X11/SM/SMlib.h>
#include <X11/ICE/ICElib.h>
+#include <boost/bind.hpp>
+
#include <compsession.h>
#include <compiz-core.h>
@@ -303,9 +307,8 @@ CompSession::getSessionClientId (CompSession::ClientIdType type)
/* This is called when data is available on an ICE connection. */
static bool
-iceProcessMessages (void *data)
+iceProcessMessages (IceConn connection)
{
- IceConn connection = (IceConn) data;
IceProcessMessagesStatus status;
SM_DEBUG (printf ("ICE connection process messages\n"));
@@ -343,8 +346,8 @@ iceNewConnection (IceConn connection,
F_GETFD,0) | FD_CLOEXEC);
iceWatchFdHandle = core->addWatchFd (IceConnectionNumber (connection),
- POLLIN | POLLPRI | POLLHUP | POLLERR,
- iceProcessMessages, connection);
+ POLLIN | POLLPRI | POLLHUP | POLLERR,
+ boost::bind (iceProcessMessages, connection));
iceConnected = 1;
}