propagate from branch 'im.pidgin.pidgin' (head 9b63613e82ab34b4b7315c801c636c365f2836c5) xmpp.custom_smiley

Fix DNS resolution. I think I broke this this morning in my revision

There was a little weirdness with the code that called the UI function

Simplify two bits of code a little

Change a string to be more user friendly (people shouldn't have any idea

Improve a few comments

merge of '538a72dda9c11907fd17a7c7a59b07bdd0edee63' xmpp.custom_smiley

propagate from branch 'im.pidgin.pidgin' (head b2b1a42a78168eb8f19ba3398c0058b6a9cac4c5) xmpp.custom_smiley

Revert my revision 3777b91f70ab86e67c1e039d08fb6d87e06f20d6, which

Don't use g_queue_get_length because it requires glib 2.4

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

mercurial