From 06847efbeef3fc52501222f8d7afcb19f9d853f2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 26 Jun 2021 15:20:17 +0530 Subject: [PATCH] Remove initialization of DBUS Not needed anymore all remaining uses of dbus dont require an event loop as far as I can tell --- src/calibre/gui_launch.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/calibre/gui_launch.py b/src/calibre/gui_launch.py index 6e2bdc4e1a..48582d7332 100644 --- a/src/calibre/gui_launch.py +++ b/src/calibre/gui_launch.py @@ -36,14 +36,6 @@ def detach_gui(): do_detach() -def init_dbus(): - from calibre.constants import islinux, isbsd - if islinux or isbsd: - from dbus.mainloop.glib import DBusGMainLoop, threads_init - threads_init() - DBusGMainLoop(set_as_default=True) - - def register_with_default_programs(): from calibre.constants import iswindows if iswindows: @@ -67,7 +59,6 @@ def calibre(args=sys.argv): from calibre.debug import print_basic_debug_info print_basic_debug_info() detach_gui() - init_dbus() with register_with_default_programs(): from calibre.gui2.main import main main(args) @@ -75,7 +66,6 @@ def calibre(args=sys.argv): def ebook_viewer(args=sys.argv): detach_gui() - init_dbus() with register_with_default_programs(): from calibre.gui2.viewer.main import main main(args) @@ -83,14 +73,12 @@ def ebook_viewer(args=sys.argv): def store_dialog(args=sys.argv): detach_gui() - init_dbus() from calibre.gui2.store.web_store import main main(args) def webengine_dialog(**kw): detach_gui() - init_dbus() from calibre.debug import load_user_plugins load_user_plugins() import importlib @@ -100,21 +88,18 @@ def webengine_dialog(**kw): def toc_dialog(**kw): detach_gui() - init_dbus() from calibre.gui2.toc.main import main main(**kw) def gui_ebook_edit(path=None, notify=None): ' For launching the editor from inside calibre ' - init_dbus() from calibre.gui2.tweak_book.main import gui_main gui_main(path, notify) def ebook_edit(args=sys.argv): detach_gui() - init_dbus() with register_with_default_programs(): from calibre.gui2.tweak_book.main import main main(args)