Merge pull request #1213 from auouymous/fix-1212

mount_volume_for_file() must only use Gtk when the Gtk UI is available.
This commit is contained in:
auouymous 2022-03-16 16:09:26 -07:00 committed by GitHub
commit 5314617e1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions

View File

@ -2292,8 +2292,13 @@ def mount_volume_for_file(file, op=None):
fashion
"""
import gi
gi.require_version('Gtk', '3.0')
from gi.repository import Gio, GLib, Gtk
gi.require_version('Gio', '2.0')
from gi.repository import Gio, GLib
if gpodder.ui.gtk:
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk
else:
loop = GLib.MainLoop()
result = True
message = None
@ -2309,10 +2314,16 @@ def mount_volume_for_file(file, op=None):
message = err.message
result = False
finally:
Gtk.main_quit()
if gpodder.ui.gtk:
Gtk.main_quit()
else:
loop.quit()
file.mount_enclosing_volume(Gio.MountMountFlags.NONE, op, None, callback)
Gtk.main()
if gpodder.ui.gtk:
Gtk.main()
else:
loop.run()
return result, message