Compiz

Merge lp:~vanvugt/compiz/fix-1066804-1066805 into lp:compiz/0.9.9

  1. fix-1066804-1066805
  2. Merge into 0.9.9
Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3418
Merged at revision: 3421
Proposed branch: lp:~vanvugt/compiz/fix-1066804-1066805
Merge into: lp:compiz/0.9.9
Diff against target: 48 lines (+9/-0)
3 files modified
plugins/composite/include/composite/composite.h (+6/-0)
plugins/composite/src/screen.cpp (+2/-0)
plugins/composite/src/window.cpp (+1/-0)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1066804-1066805
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+129801@code.launchpad.net

Commit message

Templates relating to the composite plugin should only be instantiated in
the composite plugin.
(LP: #1066804) (LP: #1066805)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3418
http://jenkins.qa.ubuntu.com/job/compiz-ci/186/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/186/console

review: Approve (continuous-integration)
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/composite/include/composite/composite.h'
2--- plugins/composite/include/composite/composite.h 2012-10-12 09:05:18 +0000
3+++ plugins/composite/include/composite/composite.h 2012-10-16 05:14:20 +0000
4@@ -114,6 +114,9 @@
5 }
6 }
7
8+class CompositeScreenInterface;
9+extern template class WrapableInterface<CompositeScreen, CompositeScreenInterface>;
10+
11 /**
12 * Wrapable function interface for CompositeScreen
13 */
14@@ -307,6 +310,9 @@
15 */
16 #define PAINT_WINDOW_BLEND_MASK (1 << 19)
17
18+class CompositeWindowInterface;
19+extern template class WrapableInterface<CompositeWindow, CompositeWindowInterface>;
20+
21 class CompositeWindowInterface :
22 public WrapableInterface<CompositeWindow, CompositeWindowInterface>
23 {
24
25=== modified file 'plugins/composite/src/screen.cpp'
26--- plugins/composite/src/screen.cpp 2012-10-12 09:05:18 +0000
27+++ plugins/composite/src/screen.cpp 2012-10-16 05:14:20 +0000
28@@ -45,6 +45,8 @@
29
30 #include <core/timer.h>
31
32+template class WrapableInterface<CompositeScreen, CompositeScreenInterface>;
33+
34 static const int FALLBACK_REFRESH_RATE = 60; /* if all else fails */
35
36 CompWindow *lastDamagedWindow = 0;
37
38=== modified file 'plugins/composite/src/window.cpp'
39--- plugins/composite/src/window.cpp 2012-10-12 09:05:18 +0000
40+++ plugins/composite/src/window.cpp 2012-10-16 05:14:20 +0000
41@@ -27,6 +27,7 @@
42
43 #include "privates.h"
44
45+template class WrapableInterface<CompositeWindow, CompositeWindowInterface>;
46 template class PluginClassHandler<CompositeWindow, CompWindow, COMPIZ_COMPOSITE_ABI>;
47
48 CompositeWindow::CompositeWindow (CompWindow *w) :

Subscribers

People subscribed via source and target branches