libubuntuone

Merge lp://staging/~dobey/libubuntuone/fix-crits into lp://staging/libubuntuone

  1. fix-crits
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 148
Merged at revision: 148
Proposed branch: lp://staging/~dobey/libubuntuone/fix-crits
Merge into: lp://staging/libubuntuone
Diff against target: 34 lines (+4/-6)
1 file modified
libubuntuoneui/u1-music-store.c (+4/-6)
To merge this branch: bzr merge lp://staging/~dobey/libubuntuone/fix-crits
Reviewer Review Type Date Requested Status
Eric Casteleijn (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+96008@code.staging.launchpad.net

Commit message

Don't register the custom handler for libsoup for now
Delay the initial loading of the connecting page, to avoid a race condition

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good.

review: Approve
Revision history for this message
Eric Casteleijn (thisfred) wrote :

+1

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

Attempt to merge into lp:libubuntuone failed due to conflicts:

text conflict in libubuntuoneui/u1-music-store.c

lp://staging/~dobey/libubuntuone/fix-crits updated
148. By dobey

Merged with trunk to resolve conflict

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