Yann Leboulanger pushed to branch master at gajim / gajim
Commits:
8e0a6091 by Yann Leboulanger at 2018-09-24T07:37:06Z
fix displaying HTML content. Fixes #9210
- - - - -
1 changed file:
- gajim/conversation_textview.py
Changes:
=====================================
gajim/conversation_textview.py
=====================================
@@ -1275,7 +1275,7 @@ class ConversationTextview(GObject.GObject):
if name and (text.startswith('/me ') or text.startswith('/me\n')):
xhtml = xhtml.replace('/me', '<i>* %s</i>' % (name,), 1)
self.tv.display_html(xhtml, self.tv, self, iter_=iter_)
- return
+ return iter_
except Exception as error:
log.debug('Error processing xhtml: %s', error)
log.debug('with |%s|', xhtml)
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e0a60911ad2d732faa7de4bcf4a2b85e9…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e0a60911ad2d732faa7de4bcf4a2b85e9…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
d29f6b2c by Philipp Hörist at 2018-09-22T13:35:45Z
Dont parse our own nick on sent carbons
Fixes #9051
- - - - -
1 changed file:
- gajim/common/modules/message.py
Changes:
=====================================
gajim/common/modules/message.py
=====================================
@@ -230,7 +230,7 @@ class Message:
'displaymarking': parse_securitylabel(event.stanza),
'attention': parse_attention(event.stanza),
'correct_id': parse_correction(event.stanza),
- 'user_nick': parse_nickname(event.stanza),
+ 'user_nick': '' if event.sent else parse_nickname(event.stanza),
'form_node': parse_form(event.stanza),
'xhtml': parse_xhtml(event.stanza),
'chatstate': parse_chatstate(event.stanza),
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d29f6b2ca92cbd3495cf5c252d310f4fb1…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d29f6b2ca92cbd3495cf5c252d310f4fb1…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
4077e0d6 by Philipp Hörist at 2018-09-22T11:20:09Z
Update mypy.ini
- - - - -
1 changed file:
- mypy.ini
Changes:
=====================================
mypy.ini
=====================================
@@ -70,4 +70,7 @@ ignore_missing_imports = True
ignore_missing_imports = True
[mypy-pygments.*]
+ignore_missing_imports = True
+
+[mypy-cairo.*]
ignore_missing_imports = True
\ No newline at end of file
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4077e0d6d6cdfc183735c46417064a1f01…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4077e0d6d6cdfc183735c46417064a1f01…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
1483020c by Philipp Hörist at 2018-09-22T06:07:46Z
Dont show encryption status for status messages
Fixes #9353
- - - - -
2 changed files:
- gajim/conversation_textview.py
- gajim/gtk/history.py
Changes:
=====================================
gajim/conversation_textview.py
=====================================
@@ -1153,7 +1153,8 @@ class ConversationTextview(GObject.GObject):
direction_mark = i18n.direction_mark
# print the encryption icon
- self.print_encryption_status(iter_, additional_data)
+ if kind in ('incoming', 'outgoing'):
+ self.print_encryption_status(iter_, additional_data)
# print the time stamp
self.print_time(text, kind, tim, simple, direction_mark,
=====================================
gajim/gtk/history.py
=====================================
@@ -535,8 +535,10 @@ class HistoryWindow:
end_iter, tim + '\n', 'time_sometimes')
# print the encryption icon
- self.history_textview.print_encryption_status(
- end_iter, additional_data)
+ if kind in (KindConstant.CHAT_MSG_SENT,
+ KindConstant.CHAT_MSG_RECV):
+ self.history_textview.print_encryption_status(
+ end_iter, additional_data)
tag_name = ''
tag_msg = ''
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1483020cf48e60dd331025bd59d178581b…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1483020cf48e60dd331025bd59d178581b…
You're receiving this email because of your account on dev.gajim.org.