summaryrefslogtreecommitdiff
path: root/src/session.cpp
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2008-09-15 22:05:41 +0200
committerDennis Kasprzyk <onestone@compiz-fusion.org>2008-09-15 22:05:41 +0200
commitd5acffa9795add9ebc9c6e6920a5e80581584863 (patch)
treea55558b31b3b8b455aa9286cf139b9f6c19df003 /src/session.cpp
parent8fcba7fa8ec54cac55d4136cfd41a3a8d9ccb192 (diff)
downloadunity-window-decorator-d5acffa9795add9ebc9c6e6920a5e80581584863.tar.gz
unity-window-decorator-d5acffa9795add9ebc9c6e6920a5e80581584863.tar.bz2
Merge CompCore and CompDisplay into CompScreen class.
Diffstat (limited to 'src/session.cpp')
-rw-r--r--src/session.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/session.cpp b/src/session.cpp
index 6c0a223..1b2b30d 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -179,7 +179,7 @@ saveYourselfCallback (SmcConn connection,
args[2].value ().set (interact_Style);
args[3].value ().set ((bool) fast);
- core->sessionEvent (CompSession::EventSaveYourself, args);
+ screen->sessionEvent (CompSession::EventSaveYourself, args);
setCloneRestartCommands (connection);
setRestartStyle (connection, SmRestartImmediately);
@@ -191,7 +191,7 @@ static void
dieCallback (SmcConn connection,
SmPointer clientData)
{
- core->sessionEvent (CompSession::EventDie, noOptions);
+ screen->sessionEvent (CompSession::EventDie, noOptions);
CompSession::closeSession ();
exit (0);
@@ -201,14 +201,14 @@ static void
saveCompleteCallback (SmcConn connection,
SmPointer clientData)
{
- core->sessionEvent (CompSession::EventSaveComplete, noOptions);
+ screen->sessionEvent (CompSession::EventSaveComplete, noOptions);
}
static void
shutdownCancelledCallback (SmcConn connection,
SmPointer clientData)
{
- core->sessionEvent (CompSession::EventShutdownCancelled, noOptions);
+ screen->sessionEvent (CompSession::EventShutdownCancelled, noOptions);
}
void
@@ -248,7 +248,7 @@ CompSession::initSession (char *prevClientId)
sizeof (errorBuffer),
errorBuffer);
if (!smcConnection)
- compLogMessage (NULL, "core", CompLogLevelWarn,
+ compLogMessage ("core", CompLogLevelWarn,
"SmcOpenConnection failed: %s",
errorBuffer);
else
@@ -345,7 +345,7 @@ iceNewConnection (IceConn connection,
fcntl (IceConnectionNumber (connection),
F_GETFD,0) | FD_CLOEXEC);
- iceWatchFdHandle = core->addWatchFd (IceConnectionNumber (connection),
+ iceWatchFdHandle = screen->addWatchFd (IceConnectionNumber (connection),
POLLIN | POLLPRI | POLLHUP | POLLERR,
boost::bind (iceProcessMessages, connection));
@@ -357,7 +357,7 @@ iceNewConnection (IceConn connection,
if (iceConnected)
{
- core->removeWatchFd (iceWatchFdHandle);
+ screen->removeWatchFd (iceWatchFdHandle);
iceWatchFdHandle = 0;
iceConnected = 0;