Philipp Hörist pushed to branch master at gajim / gajim

Commits: a08eab5a by Matthew White at 2021-07-18T11:26:58+00:00 HistoryManager: Allow it to start in standalone mode

Fixes the following error when starting gajim-history-manager:

ModuleNotFoundError: No module named 'gajim.gui.emoji_data'

- - - - - 15cf0e2a by Matthew White at 2021-07-18T11:26:58+00:00 Test: Fix test_gui_interface failure

Partially fixes #10478 about the following error:

ERROR: test_gui_interface (unittest.loader._FailedTest) ... ModuleNotFoundError: No module named 'gajim.gui.emoji_data'

- - - - -

2 changed files:

- gajim/history_manager.py - test/unit/test_gui_interface.py

Changes:

===================================== gajim/history_manager.py ===================================== @@ -55,7 +55,6 @@ from gajim.common.const import JIDConstant from gajim.common.const import KindConstant from gajim.common.const import ShowConstant -from gajim.common.settings import Settings

def is_standalone(): @@ -76,6 +75,8 @@ def init_gtk(): if is_standalone(): init_gtk()

+ from gajim.common.settings import Settings + try: shortargs = 'hvsc:l:p:' longargs = 'help verbose separate config-path= loglevel= profile=' @@ -100,6 +101,8 @@ def init_gtk(): app.settings = Settings() app.settings.init() app.load_css_config() +else: + from gajim.common.settings import Settings

from gajim.common import helpers from gajim.gui.dialogs import ErrorDialog

===================================== test/unit/test_gui_interface.py ===================================== @@ -3,6 +3,9 @@ ''' import unittest

+import gajim.gui +gajim.gui.init('gtk') + from test import lib lib.setup_env()

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f9f2a88b9f698e3aaaf5ffe8e24176fd...