Mercurial > libervia-backend

changeset 1079:c0ef97002ef4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reverted commit bb4517e69957: note was not implemented on purpose
author Goffi <goffi@goffi.org>
date Wed, 18 Jun 2014 16:35:20 +0200
parents bb4517e69957
children f25ec9fd7cc4
files src/plugins/plugin_xep_0050.py
diffstat 1 files changed, 1 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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)