merge of '83a126c3d1bd6fceebe61dd4c350672e4173bb29' mxit

merge of '12f603389f15926cba010be6a8c562cb069e46f4' mxit

I assume this check was backwards, since embedding should be used

merge of '8c4f6c2f736b3e19c36ddd31d464c6befba5940c'

Improve win32 behavior of the GtkStatusIcon based docklet.

Remove deprecated and unused PurplePluginProtocolInfo.get_cb_away.

purple_proxy_connect_socks5() was deprecated in 2.8.0, and can be removed for 3.0.0.

purple_conv_chat_set_users() has been deprecated since 2.9.0, and can be removed for 3.0.0.

purple_buddy_get_local_alias() has been deprecated since 2.6.0, and can be removed for 3.0.0.

purple_contact_set_alias() is deprecated, and can be removed for 3.0.0.

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

mercurial