Nux

Merge lp:~sil2100/nux/geis_fix into lp:nux

Proposed by Łukasz Zemczak on 2012-08-08
Status: Merged
Approved by: Sebastien Bacher on 2012-08-08
Approved revision: 646
Merged at revision: 646
Proposed branch: lp:~sil2100/nux/geis_fix
Merge into: lp:nux
Diff against target: 14 lines (+3/-1)
1 file modified
Nux/GeisAdapter.cpp (+3/-1)
To merge this branch: bzr merge lp:~sil2100/nux/geis_fix
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve on 2012-08-08
Chase Douglas (community) 2012-08-08 Approve on 2012-08-08
Review via email: mp+118760@code.launchpad.net

Commit Message

Apply fix made by Michal Hruby and Daniel d'Andrada, so that geis uses the grail backend right away. Fixes regressions caused by gesture changes. Good catch!

Description of the Change

A very important branch - patch devised by Daniel d'Andrada under the guidance of Michal Hruby that fixes all the regressions caused by the gesture additions.

- The problem:
Everything. After including the gesture changes in unity and nux, everything started going high-wire, Launcher didn't track applications, panel was acting strange. Michal Hruby (with the help of Jay and probably others) made an excellent analysis and found the possible problem.

- The fix:
geis should use the grail backend, where it was first trying the deprecated D-Bus one and only then grail - which caused chaos in D-Bus.

- Test coverage:
None.

UNBLOCK

To post a comment you must log in.
Chase Douglas (chasedouglas) wrote :

This change is perfectly fine. There shouldn't be a need for it, but this papers over a bug somewhere in geis, and there will be no negative effects.

This bug may actually be fixed by a recent merge in geis: http://bazaar.launchpad.net/~oif-team/geis/trunk/revision/279.1.1. This fix has not been released yet, however. However, even when we do release it, and if it fixes this issue, it won't be worthwhile to revert this patch anyway.

review: Approve
Jay Taoko (jaytaoko) wrote :

Tested and it resolves the bug I had yesterday.

review: Approve
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-nux/140/console reported an error when processing this lp:~sil2100/nux/geis_fix branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Nux/GeisAdapter.cpp'
2--- Nux/GeisAdapter.cpp 2012-07-27 19:40:40 +0000
3+++ Nux/GeisAdapter.cpp 2012-08-08 14:23:36 +0000
4@@ -91,7 +91,9 @@
5 , class_touch_(nullptr)
6 , is_init_complete_(false)
7 {
8- geis_ = geis_new(GEIS_INIT_NO_ATOMIC_GESTURES, nullptr);
9+ geis_ = geis_new(GEIS_INIT_NO_ATOMIC_GESTURES,
10+ GEIS_INIT_GRAIL_BACKEND,
11+ nullptr);
12 if (!geis_)
13 {
14 LOG_WARNING(logger) << "Couldn't create a Geis instance."

Subscribers

People subscribed via source and target branches