diff libpurple/protocols/jabber/buddy.c @ 22770:cc8903c59d6b

Change the string "screen name" to "username" everywhere. I think most of us agree that "username" is a better term. Also changing the accelerator key for "Username" in the add account dialog from 'n' to 'u', which I think makes more sense.

--- a/libpurple/protocols/jabber/buddy.c	Wed Apr 30 06:02:26 2008 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Wed Apr 30 08:46:51 2008 +0000
@@ -56,8 +56,7 @@
 {
 	g_return_if_fail(jb != NULL);
 
-	if(jb->error_msg)
-		g_free(jb->error_msg);
+	g_free(jb->error_msg);
 	while(jb->resources)
 		jabber_buddy_resource_free(jb->resources->data);
 
@@ -498,6 +497,11 @@
 	if(((JabberStream*)gc->proto_data)->pep) {
 		/* XEP-0084: User Avatars */
 		if(img) {
+			/*
+			 * TODO: This is pretty gross.  The Jabber PRPL really shouldn't
+			 *       do voodoo to try to determine the image type, height
+			 *       and width.
+			 */
 			/* A PNG header, including the IHDR, but nothing else */
 			const struct {
 				guchar signature[8]; /* must be hex 89 50 4E 47 0D 0A 1A 0A */