unity-2d

Merge lp://qastaging/~fboucault/unity-2d/dash_preferred_apps_gio into lp://qastaging/unity-2d/3.0

dash_preferred_apps_gio
Merge into natty

Proposed by Florian Boucault on 2011-07-05

Status:

Merged

Approved by:

Florian Boucault on 2011-07-26

Approved revision:

622

Merged at revision:

645

Proposed branch:

lp://qastaging/~fboucault/unity-2d/dash_preferred_apps_gio

Merge into:

lp://qastaging/unity-2d/3.0

Diff against target:

293 lines (+226/-4)

6 files modified

libunity-2d-private/Unity2d/plugin.cpp (+3/-0)
libunity-2d-private/src/CMakeLists.txt (+1/-0)
libunity-2d-private/src/giodefaultapplication.cpp (+107/-0)
libunity-2d-private/src/giodefaultapplication.h (+63/-0)
places/HomeButtonDefaultApplication.qml (+48/-0)
places/HomeShortcuts.qml (+4/-4)

To merge this branch:

bzr merge lp://qastaging/~fboucault/unity-2d/dash_preferred_apps_gio

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Olivier Tilloy (community)	code functional	2011-07-05	Approve on 2011-07-25
Review via email: mp+66920@code.qastaging.launchpad.net

Description of the change

[dash] Home screen default applications are no longer retrieved from GConf.

Only the web browser and the e-mail client have been migrated to that new technique.
A new GioDefaultApplication object has been introduced that given a content type
returns the desktop file of the default application handling that type.

Revision history for this message

Olivier Tilloy (osomon) wrote on 2011-07-25:

This branch doesn’t merge cleanly into the trunk any longer, there’s a minor conflict. Please fix.

review: Needs Fixing (code)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2011-07-25:

Even though compilation is not failing locally, libunity-2d-private/src/giodefaultapplication.h should #include <QString> for correctness.

review: Needs Fixing (code)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2011-07-25:

The code looks good and functional tests are good (I tested switching my e-mail client from Evolution to Thunderbird, and my web browser between Chromium, Firefox and Opera).

Once the two previous remarks are addressed, this can be merged.

Question: what is missing to also migrate the other default applications (picture viewer and media player) to this new technique?

review: Approve (code functional)

Revision history for this message

Florian Boucault (fboucault) wrote on 2011-07-26:

> The code looks good and functional tests are good (I tested switching my
> e-mail client from Evolution to Thunderbird, and my web browser between
> Chromium, Firefox and Opera).

Fantastic, thanks.

>
> Once the two previous remarks are addressed, this can be merged.
>
> Question: what is missing to also migrate the other default applications
> (picture viewer and media player) to this new technique?

It actually only works on Oneiric so I left it out of the MR; that is the GNOME settings UI only uses those for picture viewer and media player in Oneiric.

lp://qastaging/~fboucault/unity-2d/dash_preferred_apps_gio updated on 2011-07-26