Merge lp:~didrocks/unity/connect-on-super into lp:unity

Proposed by Didier Roche on 2011-04-15
Status: Merged
Merged at revision: 1142
Proposed branch: lp:~didrocks/unity/connect-on-super
Merge into: lp:unity
Diff against target: 13 lines (+3/-0)
1 file modified
src/PlacesView.cpp (+3/-0)
To merge this branch: bzr merge lp:~didrocks/unity/connect-on-super
Reviewer Review Type Date Requested Status
Neil J. Patel (community) 2011-04-15 Approve on 2011-04-15
Review via email: mp+57831@code.launchpad.net

Description of the change

Fix missing places activation on super/shortcut.

To post a comment you must log in.
lp:~didrocks/unity/connect-on-super updated on 2011-04-15
1143. By Didier Roche on 2011-04-15

njpatel has always a cleaner fix :)

Neil J. Patel (njpatel) wrote :

Sexy.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/PlacesView.cpp'
2--- src/PlacesView.cpp 2011-04-14 09:10:30 +0000
3+++ src/PlacesView.cpp 2011-04-15 09:52:42 +0000
4@@ -445,6 +445,9 @@
5 void
6 PlacesView::ConnectPlaces (GVariant *data, PlacesView *self)
7 {
8+ if (self->_factory->GetPlaces ().size () == 0)
9+ return;
10+
11 if (!self->_places_connected)
12 {
13 std::vector<Place *>::iterator it, eit = self->_factory->GetPlaces ().end ();