Mercurial > libervia-web
diff libervia.tac @ 235:b304cdf13a3b
browser and server side: XHTML handling, first draft:
- added the extra parameter for getHistory and newMessage to manage xhtml
- if present, XHTML is shown instead of regular text message
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Thu, 07 Nov 2013 15:22:00 +0100 |
| parents | e632f77c4219 |
| children | a25aa882e09a |
line wrap: on
line diff
--- a/libervia.tac Thu Oct 31 17:54:10 2013 +0100 +++ b/libervia.tac Thu Nov 07 15:22:00 2013 +0100 @@ -309,8 +309,8 @@ for line in result_dbus: #XXX: we have to do this stupid thing because Python D-Bus use its own types instead of standard types # and txJsonRPC doesn't accept D-Bus types, resulting in a empty query - timestamp, from_jid, to_jid, message, mess_type = line - result.append((float(timestamp), unicode(from_jid), unicode(to_jid), unicode(message), unicode(mess_type))) + timestamp, from_jid, to_jid, message, mess_type, extra = line + result.append((float(timestamp), unicode(from_jid), unicode(to_jid), unicode(message), unicode(mess_type), dict(extra))) return result d.addCallback(show) return d