merge of '8ae61d6b57bc061df10585b37ccfeea0e81a737b'

Remove 'show buddy icon' leftovers to get rid of run time gtk+ warnings.

merge of '17932f81738f65a2ef3b1c46846527917bde24fb'

Do not crash for hidden convs after changing prefs.

Remove Show buddy icon from conversation menu. 'Fixes' #882

ifdef win32 the conversation placement code

merge of 'f6bd9c4ece3a4783d24abc31c8373875934c5501'

Set our alias using the appropriate function. This makes a copy of

More typos.

Typo.

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

mercurial