# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1467131849 -7200
# Node ID e6b51b7ff31fc1a8756e9fd347285a0d88e9350f
# Parent  2a85c818751acfcab269b2e75beda26a90cb1233# Parent  2f97e58b6fa17623263e75f68627a42eaae750f6
merged main branch

diff -r 2a85c818751a -r e6b51b7ff31f CHANGELOG
--- 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
diff -r 2a85c818751a -r e6b51b7ff31f frontends/src/primitivus/primitivus
--- 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