Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/disco.c @ 25988:2597de135090
Fix up merge (why can't it simply make the changes to my WD first?)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 07 Mar 2009 02:02:57 +0000 |
| parents | c4fd9222dda1 |
| children | 882748e27f9d |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/disco.c Sat Mar 07 01:59:40 2009 +0000 +++ b/libpurple/protocols/jabber/disco.c Sat Mar 07 02:02:57 2009 +0000 @@ -126,6 +126,7 @@ * handheld, pc, phone, * web */ xmlnode_set_attrib(identity, "name", PACKAGE); + } if(!node || !strcmp(node, node_uri)) { GList *features, *identities;