Merge lp://qastaging/~charlesk/indicator-sync/lp-1049480 into lp://qastaging/indicator-sync/12.10

Proposed by Charles Kerr
Status: Merged
Merged at revision: 16
Proposed branch: lp://qastaging/~charlesk/indicator-sync/lp-1049480
Merge into: lp://qastaging/indicator-sync/12.10
Diff against target: 90 lines (+46/-4)
2 files modified
src/sync-menu/sync-app.c (+6/-1)
test/test-client.cpp (+40/-3)
To merge this branch: bzr merge lp://qastaging/~charlesk/indicator-sync/lp-1049480
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Needs Fixing
Lars Karlitski (community) Approve
Review via email: mp+123886@code.qastaging.launchpad.net

Commit message

Don't crash when SyncAppMenu is passed a NULL desktop-id in its constructor.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote :

In addition to the NULL check, there should be a call to g_desktop_app_info_new to find out if the passed desktop id points to a valid application. This will:

* make the check for the empty string moot
* let us use g_app_info_get_id to get around the get_basename
* disallow passing filenames (which is a good thing)

That's not really relevant for this merge though, which looks great. Approving.

review: Approve
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-sync-autolanding/1/

review: Needs Fixing (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

After investigating the Jenkins issue with QA, Allan and I agreed to land this manually.

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

to all changes: