'Twas brillig, and Vincent Becker at 24/03/11 10:35 did gyre and gimble: > Replace wrong implementation of log to file in pa_daemon_conf_set_log_level to pa_daemon_conf_set_log_target Sorry but this is not based on git master.... (as Maarten asked for before). [colin at jimmy pulseaudio (master|AM)]$ cat ~/Download/pa.patch | patch -p1 --dry-run patching file src/daemon/daemon-conf.c Hunk #1 FAILED at 142. Hunk #2 FAILED at 170. Hunk #3 succeeded at 187 (offset -5 lines). Hunk #4 FAILED at 235. 3 out of 4 hunks FAILED -- saving rejects to file src/daemon/daemon-conf.c.rej I think it's just a matter of ignoring hunks 1 & 2 anyway (as I already made that change when I committed the original version) and the move from 4 to 3 should just be updated as the code in hunk 4 was updated (tho' the newer code is the same as you put in in your hunk 3). IOW, feel free to update your patch, or alternatively, I can just commit what I have..... (straight move of the code) which I've attached. Let me know if it's OK. Cheers Col PS, kinda embarrassed I missed this glaring error first time round :D -- Colin Guthrie gmane(at)colin.guthr.ie http://colin.guthr.ie/ Day Job: Tribalogic Limited [http://www.tribalogic.net/] Open Source: Mageia Contributor [http://www.mageia.org/] PulseAudio Hacker [http://www.pulseaudio.org/] Trac Hacker [http://trac.edgewall.org/] -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: 0001-log-Correct-bad-function-implementation.patch URL: <http://lists.freedesktop.org/archives/pulseaudio-discuss/attachments/20110324/bbc35546/attachment.asc>
