- /* if we're doing an LS, then we only send this if
- * they havent ack'd
- */
- if(clicap_list[i].cap_cli &&
- (!flags || !IsCapable(source_p, clicap_list[i].cap_cli)))
- {
- *p++ = '~';
- buflen++;
+ if (flags && !IsCapableEntry(source_p, entry))
+ continue;
+
+ if (!clicap_visible(source_p, entry))
+ continue;
+
+ if (source_p->flags & FLAGS_CLICAP_DATA) {
+ if (!flags && clicap != NULL && clicap->data != NULL)
+ data = clicap->data(source_p);
+
+ multiline_item_ret = send_multiline_item(source_p, "%s%s%s",
+ entry->cap,
+ data != NULL ? "=" : "",
+ data != NULL ? data : "");
+
+ if (multiline_item_ret == MULTILINE_FAILURE)
+ return;
+ } else {
+ multiline_item_ret = send_multiline_item(source_p, "%s", entry->cap);
+
+ if (multiline_item_ret != MULTILINE_SUCCESS) {
+ send_multiline_reset();
+ return;