merged main branch
This commit is contained in:
commit
edfdc06654
2 changed files with 5 additions and 2 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -401,7 +401,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
|
||||
|
|
|
|||
Loading…
Reference in a new issue