Merge branch 'develop' into mig5-info_widgets_download_info

This commit is contained in:
Micah Lee 2018-02-19 18:02:51 -08:00
commit 3d1c0eabc4
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
8 changed files with 36 additions and 22 deletions

View file

@ -1,9 +1,11 @@
[Desktop Entry]
Name=OnionShare
Comment=Share a file securely and anonymously over Tor
Comment[da]=Del en fil sikkert og anonymt over Tor
Exec=/usr/bin/onionshare-gui
Terminal=false
Type=Application
Icon=/usr/share/pixmaps/onionshare80.xpm
Categories=Network;
Keywords=tor;anonymity;privacy;onion service;file sharing;file hosting;
Keywords[da]=tor;anonymitet;privatliv;onion-tjeneste;fildeling;filhosting;

View file

@ -64,7 +64,7 @@ class OnionShareExtension(GObject.GObject, Nautilus.MenuProvider):
"""
def url2path(self,url):
file_uri = url.get_activation_uri()
file_uri = url.get_activation_uri()
arg_uri = file_uri[7:]
path = urllib.url2pathname(arg_uri)
return path