summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-03-18 13:13:50 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-03-18 13:13:50 +0800
commitfe48529848d31c0ed5092c84a6232713e9f829c2 (patch)
tree64fdc85fc3c6cbf274b5a229bbc6d5d3eb811f5a /src
parent0b2ed286307b4a3871b96c4edaeaf519571b6c17 (diff)
parent08ba72d1089047a69882ec8bda66d9ed85891c4c (diff)
downloadmobilebling-fe48529848d31c0ed5092c84a6232713e9f829c2.tar.gz
mobilebling-fe48529848d31c0ed5092c84a6232713e9f829c2.tar.bz2
Merge https://github.com/robtaylor/compiz
Diffstat (limited to 'src')
-rw-r--r--src/rect.cpp2
-rw-r--r--src/session.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/rect.cpp b/src/rect.cpp
index f024495..46405a2 100644
--- a/src/rect.cpp
+++ b/src/rect.cpp
@@ -62,7 +62,7 @@ CompRect::CompRect (const XRectangle xr)
mRegion.extents.y2 = xr.y + xr.height;
}
-const Region
+Region
CompRect::region () const
{
return const_cast<const Region> (&mRegion);
diff --git a/src/session.cpp b/src/session.cpp
index c05226c..3c31f8f 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -286,6 +286,8 @@ CompSession::init (char *prevClientId)
connected = true;
if (prevClientId)
smPrevClientId = strdup (prevClientId);
+ setRestartStyle (smcConnection, SmRestartImmediately);
+
}
}
}