Make the changes from Andrew Victor's 3113fa54190de8c27a27e7001e9d902dca70037c in im.pidgin.pidgin. The last line of that commit shouldn't be included here, so I'm making these changes by hand. When we merge that branch to here or vice versa it MIGHT conflict. But it should be pretty easy to figure out how to fix it.