Merge lp://staging/~ken-vandine/content-hub/appinfo_peers into lp://staging/content-hub

Proposed by Ken VanDine
Status: Superseded
Proposed branch: lp://staging/~ken-vandine/content-hub/appinfo_peers
Merge into: lp://staging/content-hub
Diff against target: 88 lines (+17/-9)
4 files modified
import/Ubuntu/Content/ContentPeerPicker10.qml (+1/-1)
import/Ubuntu/Content/ContentPeerPicker11.qml (+1/-1)
import/Ubuntu/Content/ContentPeerPicker13.qml (+1/-1)
src/com/ubuntu/content/peer.cpp (+14/-6)
To merge this branch: bzr merge lp://staging/~ken-vandine/content-hub/appinfo_peers
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+272246@code.staging.launchpad.net

Commit message

use ubuntu_app_launch_application_info to get the dir and filename for desktop files

Description of the change

use ubuntu_app_launch_application_info to get the dir and filename for desktop files

To post a comment you must log in.
252. By Ken VanDine

merged picker_wordwrap

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
253. By Ken VanDine

merged picker_wordwrap

254. By Ken VanDine

merged picker_wordwrap

255. By Ken VanDine

Ensure we don't query for appinfo on the client side

256. By Ken VanDine

added more logging to peer

257. By Ken VanDine

* Fallback to loading the desktop file as a g_key_file if we fail to get a valid GAppInfo.
* Added dbus API for creating a peer to properly marshal metadata and icon

258. By Ken VanDine

used defines for keys

259. By Ken VanDine

Fixed icon handling

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches