Mercurial > pidgin
changeset 25990:1c450685dbc6
merge of 'e50b65be3a30b5e9c665a8ee87d28f19e225f459'
and 'e75da66768159491d6adf832c4cef8d3f88ce2d0'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 15 Mar 2009 04:49:00 +0000 |
| parents | f36a94f19db3 (current diff) 592b88eae0d5 (diff) |
| children | 71835e00c0fc |
| files | |
| diffstat | 1 files changed, 0 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/presence.c Sun Mar 15 04:48:47 2009 +0000 +++ b/libpurple/protocols/jabber/presence.c Sun Mar 15 04:49:00 2009 +0000 @@ -273,39 +273,6 @@ xmlnode_set_attrib(c, "hash", "sha-1"); xmlnode_set_attrib(c, "ver", jabber_caps_get_own_hash(js)); -#if 0 - if(js != NULL) { - /* add the extensions */ - char extlist[1024]; - unsigned remaining = 1023; /* one less for the \0 */ - GList *feature; - - extlist[0] = '\0'; - for(feature = jabber_features; feature && remaining > 0; feature = feature->next) { - JabberFeature *feat = (JabberFeature*)feature->data; - unsigned featlen; - - if(feat->is_enabled != NULL && feat->is_enabled(js, feat->shortname, feat->namespace) == FALSE) - continue; /* skip this feature */ - - featlen = strlen(feat->shortname); - - /* cut off when we don't have any more space left in our buffer (too bad) */ - if(featlen > remaining) - break; - - strncat(extlist,feat->shortname,remaining); - remaining -= featlen; - if(feature->next) { /* no space at the end */ - strncat(extlist," ",remaining); - --remaining; - } - } - /* did we add anything? */ - if(remaining < 1023) - xmlnode_set_attrib(c, "ext", extlist); - } -#endif return presence; }