refactor: Rename main application entry points

5 files changed, 10 insertions, 10 deletions

diff --git a/gajim/gajim.py b/gajim/main.py
index 12eb4e318..3783a536c 100644
--- a/gajim/gajim.py
+++ b/gajim/main.py
@@ -154,7 +154,7 @@ def _set_proc_title() -> None:
             libc.setproctitle('gajim')
 
 
-def main() -> None:
+def run() -> None:
     if sys.platform != 'win32':
         if os.geteuid() == 0:
             sys.exit('You must not launch gajim as root, it is insecure.')
diff --git a/gajim/gajim_remote.py b/gajim/remote.py
index 3984c5f6b..521477b54 100644
--- a/gajim/gajim_remote.py
+++ b/gajim/remote.py
@@ -133,7 +133,7 @@ def create_arg_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def main() -> None:
+def run() -> None:
     args = create_arg_parser().parse_args()
     try:
         result = call_method(args)
diff --git a/launch.py b/launch.py
index e5757eace..62147b46b 100755
--- a/launch.py
+++ b/launch.py
@@ -3,7 +3,7 @@
 import subprocess
 
 import gajim
-from gajim.gajim import main
+import gajim.main
 
 try:
     res = subprocess.check_output(
@@ -12,4 +12,4 @@ try:
 except Exception:
     pass
 
-main()
+gajim.main.run()
diff --git a/pyproject.toml b/pyproject.toml
index 9a5dd5495..7b64a0fd7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -55,10 +55,10 @@ dev = [
 ]
 
 [project.scripts]
-gajim-remote = "gajim.gajim_remote:main"
+gajim-remote = "gajim.remote:run"
 
 [project.gui-scripts]
-gajim = "gajim.gajim:main"
+gajim = "gajim.main:run"
 
 [tool.setuptools.packages.find]
 include = ["gajim*"]
@@ -146,8 +146,8 @@ include = [
     "gajim/common/styling.py",
     "gajim/common/task_manager.py",
     "gajim/common/util/*",
-    "gajim/gajim.py",
-    "gajim/gajim_remote.py",
+    "gajim/main.py",
+    "gajim/remote.py",
     "gajim/gtk/*",
     "gajim/plugins/*",
     "test/*",
diff --git a/win/misc/create-launcher.py b/win/misc/create-launcher.py
index cf4475cba..53101f2f2 100755
--- a/win/misc/create-launcher.py
+++ b/win/misc/create-launcher.py
@@ -98,8 +98,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
         "root_path = Path(sys.executable).parents[1];"
         "from ctypes import windll;"
         "windll.kernel32.SetDllDirectoryW(str(root_path / 'bin'));"
-        "from gajim import gajim;"
-        "gajim.main();");
+        "import gajim.main;"
+        "gajim.main.run();");
     Py_Finalize();
     return result;
 }