Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
d00dfe2e by wurstsalat at 2022-07-23T22:44:01+02:00
fix: ConversationView: Fix linting error
- - - - -
3bc58246 by wurstsalat at 2022-07-23T22:44:01+02:00
imprv: Startup: Show hint in console if Gajim is already running
Fixes #11039
- - - - -
2 changed files:
- gajim/gtk/application.py
- gajim/gtk/conversation/view.py
Changes:
=====================================
gajim/gtk/application.py
=====================================
@@ -383,6 +383,8 @@ def _handle_local_options(self,
self.register()
if self.get_is_remote():
+ print('Gajim is already running. '
+ 'The primary instance will handle remote commands')
return -1
self._core_command_line(options)
=====================================
gajim/gtk/conversation/view.py
=====================================
@@ -392,7 +392,7 @@ def _reduce_messages_before(self) -> bool:
row1 = self.get_row_at_index(2)
row2 = self.get_row_at_index(3)
- if row1.type == row2.type == 'date':
+ if row1.type == 'date' and row2.type == 'date':
# First two rows are date rows,
# it’s safe to remove the fist row
row1.destroy()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/4f486209083c62ca2914fee5c9f758e45167bd4b...3bc58246edfb5664672d64ba52cd25ee66250f19
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/4f486209083c62ca2914fee5c9f758e45167bd4b...3bc58246edfb5664672d64ba52cd25ee66250f19
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
