scrobbler2: Missed some GLib -> pthread conversions.
Merge remote-tracking branch 'upstream/master'