From 6e6725882c15c3600b02bfdbc26b47e8e1621652 Mon Sep 17 00:00:00 2001 From: souliane Date: Sun, 29 May 2016 11:51:27 +0200 Subject: [PATCH 1/2] fixed a typo --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index dafccc07..7016973d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -66,7 +66,7 @@ v 0.6.1 (xx/xx/2016): - replaced isRegistered call by a more generic getSessionMetadata - new option "allow_registration" to enable/disable new accounts registration - browser side: - - improvee the popup message banner + - improved the popup message banner - replaced old favicon and display favicon counter - fixed handling of connection with external JID - improved some regexps From dc69b62b167b32e704b993cc28209d8cd9cd6687 Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 28 Jun 2016 18:32:57 +0200 Subject: [PATCH 2/2] primitivus: paste is now treated as normal text instead of discarded if edit_bar doesn't exist --- frontends/src/primitivus/primitivus | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frontends/src/primitivus/primitivus b/frontends/src/primitivus/primitivus index 2751350e..233d90e4 100755 --- a/frontends/src/primitivus/primitivus +++ b/frontends/src/primitivus/primitivus @@ -417,7 +417,10 @@ class PrimitivusApp(QuickApp, InputHistory): try: edit_bar = self.editBar except AttributeError: - log.warning(u"Paste discarded: there is no edit bar yet") + log.warning(u"Paste treated as normal text: there is no edit bar yet") + if extra is None: + extra = [] + extra.extend(input_) else: if self.main_widget.focus == edit_bar: # XXX: if a paste is detected, we append it directly to the edit bar text