Unity

Merge lp:~azzar1/unity/lp-1203129 into lp:unity

  1. lp-1203129
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 3434
Proposed branch: lp:~azzar1/unity/lp-1203129
Merge into: lp:unity
Diff against target: 23 lines (+2/-0)
2 files modified
plugins/unityshell/src/unityshell.cpp (+1/-0)
plugins/unityshell/src/unityshell.h (+1/-0)
To merge this branch: bzr merge lp:~azzar1/unity/lp-1203129
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Review via email: mp+175906@code.launchpad.net

Commit message

Define/Init UnityWindow::cWindow.

Description of the change

== Problem ==
Bug #1203129: unity crashes on cltr+super+d

== Fix ==
Define and init UnityWindow::cWindow.

== Test ==
N/A

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Cool!

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

PASSED: Continuous integration, rev:3431
http://jenkins.qa.ubuntu.com/job/unity-ci/264/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/152

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/264/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2013-07-10 18:25:29 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2013-07-19 17:39:31 +0000
4@@ -3451,6 +3451,7 @@
5 : BaseSwitchWindow (dynamic_cast<BaseSwitchScreen *> (UnityScreen::get (screen)), window)
6 , PluginClassHandler<UnityWindow, CompWindow>(window)
7 , window(window)
8+ , cWindow(CompositeWindow::get(window))
9 , gWindow(GLWindow::get(window))
10 , is_nux_window_(isNuxWindow(window))
11 {
12
13=== modified file 'plugins/unityshell/src/unityshell.h'
14--- plugins/unityshell/src/unityshell.h 2013-06-19 16:00:52 +0000
15+++ plugins/unityshell/src/unityshell.h 2013-07-19 17:39:31 +0000
16@@ -364,6 +364,7 @@
17 ~UnityWindow();
18
19 CompWindow* window;
20+ CompositeWindow* cWindow;
21 GLWindow* gWindow;
22
23 nux::Geometry last_bound;