diff options
author | Calum Lind <calumlind+deluge@gmail.com> | 2019-06-12 15:44:44 +0100 |
---|---|---|
committer | Calum Lind <calumlind+deluge@gmail.com> | 2019-06-12 16:05:15 +0100 |
commit | a2dee79439a6ecc05b36e55eaeb350f90e13e831 (patch) | |
tree | 30683f4bb14f0a7ddd0e06267ffd24f390909d34 /deluge/ui/gtk3/gtkui.py | |
parent | 7a54db31792a73c6f63d13916c1f2f42518b8958 (diff) | |
download | deluge-a2dee79439a6ecc05b36e55eaeb350f90e13e831.tar.gz deluge-a2dee79439a6ecc05b36e55eaeb350f90e13e831.tar.bz2 deluge-a2dee79439a6ecc05b36e55eaeb350f90e13e831.zip |
[GTK] Improve detecting X11 display server
GdkX11 still imports on Wayland so check display server is X11 before
importing.
Diffstat (limited to 'deluge/ui/gtk3/gtkui.py')
-rw-r--r-- | deluge/ui/gtk3/gtkui.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/deluge/ui/gtk3/gtkui.py b/deluge/ui/gtk3/gtkui.py index 73a329fb7..d93bd2e9a 100644 --- a/deluge/ui/gtk3/gtkui.py +++ b/deluge/ui/gtk3/gtkui.py @@ -22,7 +22,6 @@ gi.require_version('Gtk', '3.0') # NOQA: E402 gi.require_version('Gdk', '3.0') # NOQA: E402 # isort:imports-thirdparty -from gi.repository.Gdk import Display from gi.repository.GLib import set_prgname from gi.repository.Gtk import Builder, ResponseType from twisted.internet import defer, gtk3reactor @@ -55,7 +54,7 @@ from deluge.ui.tracker_icons import TrackerIcons # isort:imports-localfolder from .addtorrentdialog import AddTorrentDialog -from .common import associate_magnet_links +from .common import associate_magnet_links, windowing from .connectionmanager import ConnectionManager from .dialogs import YesNoDialog from .filtertreeview import FilterTreeView @@ -139,10 +138,6 @@ DEFAULT_PREFS = { } -def windowing(like): - return like.lower() in str(type(Display.get_default())).lower() - - class GtkUI(object): def __init__(self, args): # Setup gtkbuilder/glade translation |