Comment 11 for bug 1071950

Functionally, the patch looks pretty good to me. Thanks for the attention to detail with respect to the signal disconnection.

One small detail is that the function you introduce should be marked 'static' (since it is not used outside of the current file). Otherwise, everything else looks fine. A comment about why this function exists is probably also reasonable since it's non-obvious from just looking at it.