Merge lp:~mhr3/unity-2d/default-filesystemlenses-constructor into lp:unity-2d

Proposed by Michal Hruby
Status: Merged
Approved by: Gerry Boland
Approved revision: 929
Merged at revision: 929
Proposed branch: lp:~mhr3/unity-2d/default-filesystemlenses-constructor
Merge into: lp:unity-2d
Diff against target: 12 lines (+1/-1)
1 file modified
libunity-2d-private/src/lenses.cpp (+1/-1)
To merge this branch: bzr merge lp:~mhr3/unity-2d/default-filesystemlenses-constructor
Reviewer Review Type Date Requested Status
unity-2d-team Pending
Review via email: mp+94102@code.launchpad.net

Description of the change

Use default FilesystemLenses constructor.

There is an API break pending in UnityCore which affects the other constructor and unity-2d has no reason to use it.

Trivial change, covered by existing tests.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libunity-2d-private/src/lenses.cpp'
--- libunity-2d-private/src/lenses.cpp 2012-01-27 17:48:24 +0000
+++ libunity-2d-private/src/lenses.cpp 2012-02-22 08:50:21 +0000
@@ -39,7 +39,7 @@
39 setRoleNames(roles);39 setRoleNames(roles);
4040
41 m_homeLens = new unity::dash::HomeLens(u2dTr("Home").toStdString(), u2dTr("Home screen").toStdString(), u2dTr("Search").toStdString());41 m_homeLens = new unity::dash::HomeLens(u2dTr("Home").toStdString(), u2dTr("Home screen").toStdString(), u2dTr("Search").toStdString());
42 m_unityLenses = new unity::dash::FilesystemLenses("/usr/share/unity/lenses");42 m_unityLenses = new unity::dash::FilesystemLenses();
43 m_homeLens->AddLenses(*m_unityLenses);43 m_homeLens->AddLenses(*m_unityLenses);
44 m_homeLens->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));44 m_homeLens->lens_added.connect(sigc::mem_fun(this, &Lenses::onLensAdded));
45 unity::dash::HomeLens::Ptr homeLensPtr(m_homeLens);45 unity::dash::HomeLens::Ptr homeLensPtr(m_homeLens);

Subscribers

People subscribed via source and target branches