Mercurial > pidgin
changeset 19728:bc0157120924
merge of '629d4e0dcf9bd35671fc00e61b6f09e381345e7c'
and 'c34261dcaedd89393d0245841d86c9394790e09c'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 11 Sep 2007 03:43:19 +0000 |
| parents | 30e4912e4a27 (current diff) 64e0c7fa92c9 (diff) |
| children | d397000d32fc |
| files | libpurple/protocols/jabber/caps.c |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/caps.c Tue Sep 11 01:57:29 2007 +0000 +++ b/libpurple/protocols/jabber/caps.c Tue Sep 11 03:43:19 2007 +0000 @@ -191,17 +191,18 @@ xmlnode *root = user_data; xmlnode *ext = xmlnode_new_child(root,"ext"); GList *iter; - + xmlnode_set_attrib(ext,"identifier",extname); - + for(iter = props->identities; iter; iter = g_list_next(iter)) { JabberCapsIdentity *id = iter->data; xmlnode *identity = xmlnode_new_child(ext, "identity"); xmlnode_set_attrib(identity, "category", id->category); xmlnode_set_attrib(identity, "type", id->type); - xmlnode_set_attrib(identity, "name", id->name); + if (id->name) + xmlnode_set_attrib(identity, "name", id->name); } - + for(iter = props->features; iter; iter = g_list_next(iter)) { const char *feat = iter->data; xmlnode *feature = xmlnode_new_child(ext, "feature");
--- a/libpurple/protocols/myspace/myspace.c Tue Sep 11 01:57:29 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.c Tue Sep 11 03:43:19 2007 +0000 @@ -2933,7 +2933,7 @@ /** Based on MSN's plugin info comments. */ -PurplePluginInfo info = { +static PurplePluginInfo info = { PURPLE_PLUGIN_MAGIC, PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION,