# HG changeset patch # User Goffi # Date 1403102120 -7200 # Node ID c0ef97002ef4bcd176f61cd0530e606a85bbba2b # Parent bb4517e699577f6014195658ff9f2a48fe76b80e reverted commit bb4517e69957: note was not implemented on purpose diff -r bb4517e69957 -r c0ef97002ef4 src/plugins/plugin_xep_0050.py --- a/src/plugins/plugin_xep_0050.py Wed Jun 18 14:55:35 2014 +0200 +++ b/src/plugins/plugin_xep_0050.py Wed Jun 18 16:35:20 2014 +0200 @@ -262,18 +262,7 @@ remote_session_id = command_elt.getAttribute('sessionid') if remote_session_id: session_data['remote_id'] = remote_session_id - try: - data_elt = command_elt.elements(data_form.NS_X_DATA, 'x').next() - except StopIteration: - # FIXME: command answer can contains several 'note' elements - try: - data_elt = command_elt.elements(NS_COMMANDS, 'note').next() - xml_ui = xml_tools.XMLUI('popup', title=data_elt.getAttribute('type')) - xml_ui.addText(str(data_elt)) - return xml_ui - except StopIteration: - log.error(_('Unmanaged command answer: %s') % command_elt.toXml()) - return None + data_elt = command_elt.elements(data_form.NS_X_DATA, 'x').next() if session_id is None: return xml_tools.dataFormResult2XMLUI(data_elt) form = data_form.Form.fromElement(data_elt)