summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2010-12-08 00:54:29 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2010-12-08 00:54:29 +0800
commitabb087437f97baa09046b4d081c10a71de5f97ad (patch)
treefac3e67b4076d9d867d4e9e7f68c1b3fcaa1f33d /include
parent9211a51cf0cc98ae6fef4a33a4cc13c3f0959ac0 (diff)
parent4666435ec53105675c67225e6d5fd18101627353 (diff)
downloadmobileperf-abb087437f97baa09046b4d081c10a71de5f97ad.tar.gz
mobileperf-abb087437f97baa09046b4d081c10a71de5f97ad.tar.bz2
Merge git://git.compiz.org/compiz/core into glibmm-experimental
Conflicts: include/core/screen.h
Diffstat (limited to 'include')
-rw-r--r--include/core/screen.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/core/screen.h b/include/core/screen.h
index 9b6509d..aa6ab5a 100644
--- a/include/core/screen.h
+++ b/include/core/screen.h
@@ -39,6 +39,8 @@
class CompScreen;
class PrivateScreen;
+class CompManager;
+
typedef std::list<CompWindow *> CompWindowList;
typedef std::vector<CompWindow *> CompWindowVector;
@@ -400,6 +402,8 @@ class CompScreen :
friend class PrivateWindow;
friend class ModifierHandler;
friend class CompEventSource;
+ friend class CompManager;
+ friend class CompWatchFd;
private:
PrivateScreen *priv;
@@ -467,8 +471,6 @@ class CompScreen :
void *userData);
static int checkForError (Display *dpy);
-
- friend class CompWatchFd;
};
#endif