summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-02 16:01:58 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-02 16:01:58 -0300
commitf33cbc3a7e92ce742ee213018d16152f4996b64e (patch)
tree9e88729a2436ef2dba4f320344aade40d0cd9a7a /src/leap
parent2d876399d2857fd021fe9d37a97c250c385ccdf8 (diff)
parentf8f428395b32f5e0d4f4c8dfb5595755dae80e54 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/5433_unescape-logs-for-pastebin' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/loggerwindow.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/leap/bitmask/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py
index c01642fc..9f396574 100644
--- a/src/leap/bitmask/gui/loggerwindow.py
+++ b/src/leap/bitmask/gui/loggerwindow.py
@@ -127,7 +127,7 @@ class LoggerWindow(QtGui.QDialog):
current_history = []
for line in history:
self._add_log_line(line)
- message = cgi.escape(line[LeapLogHandler.MESSAGE_KEY])
+ message = line[LeapLogHandler.MESSAGE_KEY]
current_history.append(message)
self._current_history = "\n".join(current_history)
@@ -222,7 +222,6 @@ class LoggerWindow(QtGui.QDialog):
"""
msg = self.tr("Your pastebin link <a href='{0}'>{0}</a>")
msg = msg.format(link)
- logger.debug(msg)
show_info = lambda: QtGui.QMessageBox.information(
self, self.tr("Pastebin OK"), msg)
self._set_pastebin_sending(False)