With the spatch to use GLib memory functions a lot of error paths were removed. This causes an unused variable warning, so drop in a further patch to remove the unused variable.
