Mercurial > pidgin
diff libpurple/protocols/jabber/usernick.c @ 25952:5f9a24d1c25e
Remove some extra trailing whitespace I noticed after merging mlundblad's
xmpp branches.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Mon, 02 Mar 2009 06:37:05 +0000 |
parents | dccfd999ffe7 |
children | c4fd9222dda1 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/usernick.c Mon Mar 02 06:26:15 2009 +0000 +++ b/libpurple/protocols/jabber/usernick.c Mon Mar 02 06:37:05 2009 +0000 @@ -34,11 +34,11 @@ JabberBuddy *buddy = jabber_buddy_find(js, from, FALSE); xmlnode *nick; char *nickname = NULL; - + /* ignore the tune of people not on our buddy list */ if (!buddy || !item) return; - + nick = xmlnode_get_child_with_namespace(item, "nick", "http://jabber.org/protocol/nick"); if (!nick) return; @@ -49,15 +49,15 @@ static void do_nick_set(JabberStream *js, const char *nick) { xmlnode *publish, *nicknode; - + publish = xmlnode_new("publish"); xmlnode_set_attrib(publish,"node","http://jabber.org/protocol/nick"); nicknode = xmlnode_new_child(xmlnode_new_child(publish, "item"), "nick"); xmlnode_set_namespace(nicknode, "http://jabber.org/protocol/nick"); - + if(nick && nick[0] != '\0') xmlnode_insert_data(nicknode, nick, -1); - + jabber_pep_publish(js, publish); /* publish is freed by jabber_pep_publish -> jabber_iq_send -> jabber_iq_free (yay for well-defined memory management rules) */ @@ -66,13 +66,13 @@ static void do_nick_got_own_nick_cb(JabberStream *js, const char *from, xmlnode *items) { char *oldnickname = NULL; xmlnode *item = xmlnode_get_child(items,"item"); - + if(item) { xmlnode *nick = xmlnode_get_child_with_namespace(item,"nick","http://jabber.org/protocol/nick"); if(nick) oldnickname = xmlnode_get_data(nick); } - + purple_request_input(js->gc, _("Set User Nickname"), _("Please specify a new nickname for you."), _("This information is visible to all contacts on your contact list, so choose something appropriate."), oldnickname, FALSE, FALSE, NULL, _("Set"), PURPLE_CALLBACK(do_nick_set), _("Cancel"), NULL, @@ -84,7 +84,7 @@ PurpleConnection *gc = (PurpleConnection *) action->context; JabberStream *js = gc->proto_data; char *jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain); - + /* since the nickname might have been changed by another resource of this account, we always have to request the old one from the server to present as the default for the new one */ jabber_pep_request_item(js, jid, "http://jabber.org/protocol/nick", NULL, do_nick_got_own_nick_cb);