Fix a botched line in the merge... next.minor

propagate from branch 'im.pidgin.pidgin' (head 8c8bd0d2036f11aaac367b727148b22391d9a182) next.minor

merge of 'eacb566127a78d1f55928e4c5813279c0f9b3a68'

merge of '7a6728df79988ba7e5c1d4eb8895927c1a99dcd3'

Keep track of the user ID in the MsimUser struct so that we have a copy

Don't create a temporary PurpleBuddy when getting info for someone not

String changes (a few of which I had already made, grumble grumble).

Use ref-counting to prevent a crash if request-auth callbacks are called

disapproval of revision '2d9389f32256ca757b17d7cabe9d9beebce0d311'

Advertise the same typing capability on OSCAR that ICQ 6 does, since we claim

(0) -10000 -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 tip

mercurial