comparison 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.
author Mark Doliner <mark@kingant.net>
date Wed, 30 Apr 2008 08:46:51 +0000
parents 46ab2e2171b8
children 485689a88b61
comparison
equal deleted inserted replaced
22769:2ff3eb79078d 22770:cc8903c59d6b
54 54
55 void jabber_buddy_free(JabberBuddy *jb) 55 void jabber_buddy_free(JabberBuddy *jb)
56 { 56 {
57 g_return_if_fail(jb != NULL); 57 g_return_if_fail(jb != NULL);
58 58
59 if(jb->error_msg) 59 g_free(jb->error_msg);
60 g_free(jb->error_msg);
61 while(jb->resources) 60 while(jb->resources)
62 jabber_buddy_resource_free(jb->resources->data); 61 jabber_buddy_resource_free(jb->resources->data);
63 62
64 g_free(jb); 63 g_free(jb);
65 } 64 }
496 PurpleStatus *status; 495 PurpleStatus *status;
497 496
498 if(((JabberStream*)gc->proto_data)->pep) { 497 if(((JabberStream*)gc->proto_data)->pep) {
499 /* XEP-0084: User Avatars */ 498 /* XEP-0084: User Avatars */
500 if(img) { 499 if(img) {
500 /*
501 * TODO: This is pretty gross. The Jabber PRPL really shouldn't
502 * do voodoo to try to determine the image type, height
503 * and width.
504 */
501 /* A PNG header, including the IHDR, but nothing else */ 505 /* A PNG header, including the IHDR, but nothing else */
502 const struct { 506 const struct {
503 guchar signature[8]; /* must be hex 89 50 4E 47 0D 0A 1A 0A */ 507 guchar signature[8]; /* must be hex 89 50 4E 47 0D 0A 1A 0A */
504 struct { 508 struct {
505 guint32 length; /* must be 0x0d */ 509 guint32 length; /* must be 0x0d */