diff options
| author | Sam Spilsbury <smspillaz@gmail.com> | 2010-02-05 00:03:50 +0800 |
|---|---|---|
| committer | Sam Spilsbury <smspillaz@gmail.com> | 2010-02-05 00:03:50 +0800 |
| commit | 66f4693a0bc49c2cac25a37823fdbbb14d3aa970 (patch) | |
| tree | 682f87e77b2386e93a1237162b525e5f4f085459 /include | |
| parent | 08c22af5823771444b8c189c265a526ccb998068 (diff) | |
| parent | d6769e8e58c5582dbcfb1b713a3e44673f75f451 (diff) | |
| download | zcomp-66f4693a0bc49c2cac25a37823fdbbb14d3aa970.tar.gz zcomp-66f4693a0bc49c2cac25a37823fdbbb14d3aa970.tar.bz2 | |
Merge branch 'master' of git+ssh://git.compiz.org/git/compiz/core
Conflicts:
plugins/place/src/place.cpp
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/screen.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/core/screen.h b/include/core/screen.h index ff971de..eb6332d 100644 --- a/include/core/screen.h +++ b/include/core/screen.h @@ -128,7 +128,7 @@ class ScreenInterface : public WrapableInterface<CompScreen, ScreenInterface> { class CompScreen : public CompSize, - public WrapableHandler<ScreenInterface, 17>, + public WrapableHandler<ScreenInterface, 18>, public PluginClassStorage, public CompOption::Class { @@ -321,6 +321,8 @@ class CompScreen : bool updateDefaultIcon (); + void updateSupportedWmHints (); + static unsigned int allocPluginClassIndex (); static void freePluginClassIndex (unsigned int index); |