Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove initialization of DBUS

Browse Source 
Not needed anymore all remaining uses of dbus dont require an event loop
as far as I can tell
This commit is contained in:
Kovid Goyal 2021-06-26 15:20:17 +05:30
parent d630ca0674
commit 06847efbee
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/gui_launch.py
View File

@ -36,14 +36,6 @@ def detach_gui():
do_detach() 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(): def register_with_default_programs():
from calibre.constants import iswindows from calibre.constants import iswindows
if iswindows: if iswindows:
@ -67,7 +59,6 @@ def calibre(args=sys.argv):
from calibre.debug import print_basic_debug_info from calibre.debug import print_basic_debug_info
print_basic_debug_info() print_basic_debug_info()
detach_gui() detach_gui()
init_dbus()
with register_with_default_programs(): with register_with_default_programs():
from calibre.gui2.main import main from calibre.gui2.main import main
main(args) main(args)
@ -75,7 +66,6 @@ def calibre(args=sys.argv):
def ebook_viewer(args=sys.argv): def ebook_viewer(args=sys.argv):
detach_gui() detach_gui()
init_dbus()
with register_with_default_programs(): with register_with_default_programs():
from calibre.gui2.viewer.main import main from calibre.gui2.viewer.main import main
main(args) main(args)
@ -83,14 +73,12 @@ def ebook_viewer(args=sys.argv):
def store_dialog(args=sys.argv): def store_dialog(args=sys.argv):
detach_gui() detach_gui()
init_dbus()
from calibre.gui2.store.web_store import main from calibre.gui2.store.web_store import main
main(args) main(args)
def webengine_dialog(**kw): def webengine_dialog(**kw):
detach_gui() detach_gui()
init_dbus()
from calibre.debug import load_user_plugins from calibre.debug import load_user_plugins
load_user_plugins() load_user_plugins()
import importlib import importlib
@ -100,21 +88,18 @@ def webengine_dialog(**kw):
def toc_dialog(**kw): def toc_dialog(**kw):
detach_gui() detach_gui()
init_dbus()
from calibre.gui2.toc.main import main from calibre.gui2.toc.main import main
main(**kw) main(**kw)
def gui_ebook_edit(path=None, notify=None): def gui_ebook_edit(path=None, notify=None):
' For launching the editor from inside calibre ' ' For launching the editor from inside calibre '
init_dbus()
from calibre.gui2.tweak_book.main import gui_main from calibre.gui2.tweak_book.main import gui_main
gui_main(path, notify) gui_main(path, notify)
def ebook_edit(args=sys.argv): def ebook_edit(args=sys.argv):
detach_gui() detach_gui()
init_dbus()
with register_with_default_programs(): with register_with_default_programs():
from calibre.gui2.tweak_book.main import main from calibre.gui2.tweak_book.main import main
main(args) main(args)