Compiz

Merge lp:~mc-return/compiz/compiz.merge-fix1195659-mousepoll-version-mismatch into lp:compiz/0.9.10

  1. compiz.merge-fix1195659-mousepoll-version-mismatch
  2. Merge into 0.9.10
Proposed by MC Return
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 3748
Merged at revision: 3749
Proposed branch: lp:~mc-return/compiz/compiz.merge-fix1195659-mousepoll-version-mismatch
Merge into: lp:compiz/0.9.10
Diff against target: 11 lines (+1/-1)
1 file modified
plugins/mousepoll/src/private.h (+1/-1)
To merge this branch: bzr merge lp:~mc-return/compiz/compiz.merge-fix1195659-mousepoll-version-mismatch
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Łukasz Zemczak Approve
Review via email: mp+171994@code.launchpad.net

Commit message

Mousepoll:
Fixed mousepoll version mismatch.
(COMPIZ_MOUSEPOLL_ABI was missing)

(LP: #1195659)

Description of the change

Note:
This is tested and works and I carry the whole responsibility for this fix on my shoulders ;)

...but please get this approved ASAP, as the bug breaks all plugins that need mousepoll to get the actual position of the pointer.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Oh, ok, that was messed up ;p +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3748
http://jenkins.qa.ubuntu.com/job/compiz-ci/221/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/262/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/221/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/mousepoll/src/private.h'
2--- plugins/mousepoll/src/private.h 2013-05-16 10:27:22 +0000
3+++ plugins/mousepoll/src/private.h 2013-06-28 10:28:26 +0000
4@@ -71,7 +71,7 @@
5 #define NUM_OPTIONS(s) (sizeof ((s)->opt) / sizeof (CompOption))
6
7 class MousepollPluginVTable :
8- public CompPlugin::VTableForScreen<MousepollScreen>
9+ public CompPlugin::VTableForScreen<MousepollScreen, COMPIZ_MOUSEPOLL_ABI>
10 {
11 public:
12

Subscribers

People subscribed via source and target branches

to all changes: