Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-07 17:05:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/canerbasaran/onionshare into canerbasaran-master

Browse source 
Conflicts:
	onionshare_gui/onionshare_gui.py
This commit is contained in:
Micah Lee 2014-08-26 16:59:48 -07:00
commit 805522be36
3 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
onionshare_gui/onionshare_gui.py
View file

@ -47,7 +47,7 @@ class OnionShareGui(QtGui.QWidget):
def init_ui(self, filename, basename):
# window
self.setWindowTitle("{0} | OnionShare".format(basename))
self.setWindowTitle(u"{0} | OnionShare".format(basename.decode("utf-8")))
self.resize(580, 400)
self.setMinimumSize(580, 400)
self.setMaximumSize(580, 400)
@ -295,7 +295,7 @@ def select_file(strings, filename=None):
if not filename:
return False, False
filename = str(filename)
filename = str(unicode(filename).encode("utf-8"))
# validate filename
if not os.path.isfile(filename):