Mercurial > libervia-backend

changeset 1982:e6b51b7ff31f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged main branch
author Goffi <goffi@goffi.org>
date Tue, 28 Jun 2016 18:37:29 +0200
parents 2a85c818751a (current diff) 2f97e58b6fa1 (diff)
children 8c4087fd034a
files frontends/src/primitivus/primitivus
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Tue Jun 28 18:31:08 2016 +0200
+++ b/CHANGELOG	Tue Jun 28 18:37:29 2016 +0200
@@ -66,7 +66,7 @@
                - 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
--- a/frontends/src/primitivus/primitivus	Tue Jun 28 18:31:08 2016 +0200
+++ b/frontends/src/primitivus/primitivus	Tue Jun 28 18:37:29 2016 +0200
@@ -401,7 +401,10 @@
             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