Sort by status, then alphabetical. Sorting by status and then "none"
ends up being unstable somehow. This seems to work for me when
clicking on stuff.

Fixes #11892.
Changelog Sort-by-status fix.
Apply the timer-check patch that I supplied in #13139. Should now show
a docklet icon on the older GTK+.

Fixes #13139.
Add P2Pv2 header information to the P2P info struct. Of course, all
the v2 stuff does nothing right now.
Add some missing Perl conversation functions
Rename "userName" to "friendly_name" to be consistent with the term we
use for this everywhere, and to get rid of the camel case var name.
Also remove a stray space
Fix a memleak in the MSN prpl when removing a buddy from your buddy list.
We needed to call msn_user_unref() after calling msn_userlist_remove_user()

I chose to fix this by changing msn_userlist_add_user() and
msn_userlist_remove_user() to incremend and decrement the reference counter
themselves--after all, they ARE the ones who add/remove a reference to
the MsnUser struct.  Conceptually I thought this made the most sense.
Hopefully fixes #13298, the bug about not being able to add MSN buddies.
Here's what I think is happening:
1. Before we add the buddy we issue an FQY request to ask the server what
   network the username is for (either normal MSN or Yahoo)
2. When we get the response we add the buddy to our buddy list with the
   network ID given to us by the server
3. For some reason the server is now returning a network ID of 0 ("unknown")
   instead of 1 ("normal MSN") for normal passport buddies, and we bail out
   when we encounter this.  QuLogic thinks the server used to return 1 in
   this case.

My change is to just not bail out if the FQY response has network ID 0.
Instead of treat 0 as 1 and continue with the add.  It looks like our
SOAP request to add the buddy to our address book will fail a big further
down the road if the buddy doesn't exist--so we're still protecting
against that.
Add two valid email addresses to this list
Remove some duplicate code.
Strip spaces when normalizing MSN usernames. Spaces in the account
name magically worked, but caused weird problems such as broken
don't-open-a-chat-on-MPOP logic.

Fixes #13173.
Ignore display name updates that are NULL. In all cases, the new
display name is either non-NULL, or the MsnUser is new and the saved
display name is already NULL anyway. This change leads to the next
revision...
Use NULL for the display name when parsing the the privacy member
lists. The display names on this list are totally bogus and outdated,
causing old names to show up when somebody adds you to their list.
Along with the previous commit, this will ignore the display names
from there.

Fixes #12030.
merge of 'b7cfae50e10c44cf3be062d0172c15bef3d04355'
     and '9c05c935a848e8973908d662ec3147140f83870d'
propagate from branch 'im.pidgin.pidgin.mxit' (head 721da633f8fb92e8c52ec4fc6567e68ce0698419)
            to branch 'im.pidgin.pidgin' (head 3c15f73efbad9588680e7bb348135d36ed573e5a)
Fix up some cases of file transfers never finishing.  This will help certain
instances of Yahoo file transfers not working, but not all.  Fixes #12472.


committer: John Bailey <rekkanoryo@rekkanoryo.org>
Credit Cristi and fix up the !ChangeLog a bit for consistency.  Refs #12472.
Remove the dependency on libstartup-notification.  Our use of it had some bugs
and we don't need it anyway, as GTK+ has included startup notification support
since their 2.2.0.  Fixes #13245.


committer: John Bailey <rekkanoryo@rekkanoryo.org>
Credit where due.  Refs #13245.
prepare German translation for 2.7.11 release