# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1237092540 0
# Node ID 1c450685dbc6fd57a0970727e09cc2d31288abf5
# Parent  f36a94f19db3003f981fc1cdc0d865047f5a8ab6# Parent  592b88eae0d5c8be8aa8988034a5a8c8510e7eca
merge of 'e50b65be3a30b5e9c665a8ee87d28f19e225f459'
     and 'e75da66768159491d6adf832c4cef8d3f88ce2d0'

diff -r f36a94f19db3 -r 1c450685dbc6 libpurple/protocols/jabber/presence.c
--- 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;
 }