copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

run xdg-open instead of webbrowser when opening files. Fixes #5751

Browse source
This commit is contained in:
Yann Leboulanger 2011-05-24 22:43:42 +02:00
parent 56fd8b246e
commit 225f74f0b8
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/common/helpers.py
View file

@ -673,6 +673,9 @@ def get_contact_dict_for_account(account):
def launch_browser_mailer(kind, uri): def launch_browser_mailer(kind, uri):
# kind = 'url' or 'mail' # kind = 'url' or 'mail'
if kind == 'url' and uri.startswith('file://'):
launch_file_manager(uri)
return
if kind in ('mail', 'sth_at_sth') and not uri.startswith('mailto:'): if kind in ('mail', 'sth_at_sth') and not uri.startswith('mailto:'):
uri = 'mailto:' + uri uri = 'mailto:' + uri
@ -698,18 +701,25 @@ def launch_browser_mailer(kind, uri):
def launch_file_manager(path_to_open): def launch_file_manager(path_to_open):
if not path_to_open.startswith('file://'):
uri = 'file://' + path_to_open uri = 'file://' + path_to_open
if os.name == 'nt':
try:
os.startfile(path_to_open) # if pywin32 is installed we open
except Exception:
pass
else:
if not gajim.config.get('autodetect_browser_mailer'): if not gajim.config.get('autodetect_browser_mailer'):
command = gajim.config.get('custom_file_manager') command = gajim.config.get('custom_file_manager')
if command == '': # if no app is configured if command == '': # if no app is configured
return return
else:
command = 'xdg-open'
command = build_command(command, path_to_open) command = build_command(command, path_to_open)
try: try:
exec_command(command) exec_command(command)
except Exception: except Exception:
pass pass
else:
webbrowser.open(uri)
def play_sound(event): def play_sound(event):
if not gajim.config.get('sounds_on'): if not gajim.config.get('sounds_on'):