diff --git a/desktop/onionshare/widgets.py b/desktop/onionshare/widgets.py index e96f3dd9..b9b69e72 100644 --- a/desktop/onionshare/widgets.py +++ b/desktop/onionshare/widgets.py @@ -71,10 +71,10 @@ class AddFileDialog(QtWidgets.QFileDialog): self.common = common self.common.log("AddFileDialog", "__init__") - self.setOption(self.DontUseNativeDialog, True) - self.setOption(self.ReadOnly, True) - self.setOption(self.ShowDirsOnly, False) - self.setFileMode(self.ExistingFiles) + self.setOption(self.Option.DontUseNativeDialog, True) + self.setOption(self.Option.ReadOnly, True) + self.setOption(self.Option.ShowDirsOnly, False) + self.setFileMode(self.FileMode.ExistingFiles) tree_view = self.findChild(QtWidgets.QTreeView) tree_view.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) list_view = self.findChild(QtWidgets.QListView, "listView") diff --git a/desktop/scripts/get-tor.py b/desktop/scripts/get-tor.py index ec9509c3..60741a5e 100644 --- a/desktop/scripts/get-tor.py +++ b/desktop/scripts/get-tor.py @@ -216,12 +216,12 @@ def get_tor_linux64(): sys.exit(-1) # Delete extracted tarball, if it's there - shutil.rmtree(os.path.join(working_path, "tor-browser_en-US"), ignore_errors=True) + shutil.rmtree(os.path.join(working_path, "tor-browser"), ignore_errors=True) # Extract the tarball subprocess.call(["tar", "-xvf", tarball_path], cwd=working_path) tarball_tor_path = os.path.join( - working_path, "tor-browser_en-US", "Browser", "TorBrowser" + working_path, "tor-browser", "Browser", "TorBrowser" ) # Copy into dist