Unity

Merge lp://qastaging/~slash-m3/unity/fix-bug-730623 into lp://qastaging/unity

fix-bug-730623
Merge into trunk

Proposed by Friik on 2011-03-14

Status:

Merged

Merged at revision:

1012

Proposed branch:

lp://qastaging/~slash-m3/unity/fix-bug-730623

Merge into:

lp://qastaging/unity

Diff against target:

220 lines (+80/-28)

4 files modified

src/PlacesController.cpp (+4/-1)
src/PlacesHomeView.cpp (+69/-26)
src/PlacesHomeView.h (+6/-1)
src/UBusMessages.h (+1/-0)

To merge this branch:

bzr merge lp://qastaging/~slash-m3/unity/fix-bug-730623

Medium

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Gord Allott (community)	2011-03-14	Needs Fixing on 2011-03-22
Jason Smith (community)		Needs Information on 2011-03-18
Review via email: mp+53189@code.qastaging.launchpad.net

Description of the change

As we don't get notified by GConf about whether or not shotwell is the preferred image viewer (or whether or not it is installed), the check for suitable shortcuts in the dash had to be done every time the dash is opened. I had to create a new UBusMessage to achieve that.
The shortcuts on the HomeView first check if the default application is available. If not (e.g. because the preferred program was just uninstalled), some alternatives are tested. And if no suitable app was found, the shortcut is simply not displayed.

Revision history for this message

Jason Smith (jassmith) wrote on 2011-03-18:

Why disable the gconf key check. It seems to me that key would also change if the user changed their default. Something we should strive to represent.

review: Needs Information

Revision history for this message

Friik (slash-m3) wrote on 2011-03-18:

Yes, it does change when the user changes his or her default. But PlacesHomeView::Refresh() is called everytime the Dash is opened anyway (every time UBUS_DASH_VISIBLE gets triggered) and then also checks the the gconf key. Leaving the gconf key notification enabled is therefore (as far as I can see) pointless when we check the gconf key anyway every time the Dash opens.

Revision history for this message

Gord Allott (gordallott) wrote on 2011-03-22:

The gconf key should stay connected, for the case that something changes whilst the dash is open - applications not being removed from the preferred application list on uninstall is a separate bug with packages/gnome that should be fixed and we should be ready to support it.

Apart from that it seems like it makes sense, best of a bad situation

review: Needs Fixing