diff --git a/onionshare_gui/__init__.py b/onionshare_gui/__init__.py index cb4f3e12..c57848a4 100644 --- a/onionshare_gui/__init__.py +++ b/onionshare_gui/__init__.py @@ -95,12 +95,6 @@ def main(): nargs="+", help="List of files or folders to share", ) - parser.add_argument( - "--config", - metavar="config", - default=False, - help="Custom JSON config file location (optional)", - ) args = parser.parse_args() filenames = args.filenames @@ -108,10 +102,6 @@ def main(): for i in range(len(filenames)): filenames[i] = os.path.abspath(filenames[i]) - config = args.config - if config: - common.load_settings(config) - local_only = bool(args.local_only) verbose = bool(args.verbose) @@ -156,7 +146,7 @@ def main(): return # Attach the GUI common parts to the common object - common.gui = GuiCommon(common, qtapp, local_only, config) + common.gui = GuiCommon(common, qtapp, local_only) # Launch the gui main_window = MainWindow(common, filenames) diff --git a/onionshare_gui/gui_common.py b/onionshare_gui/gui_common.py index c0502c3d..54086353 100644 --- a/onionshare_gui/gui_common.py +++ b/onionshare_gui/gui_common.py @@ -30,17 +30,13 @@ class GuiCommon: MODE_RECEIVE = "receive" MODE_WEBSITE = "website" - def __init__(self, common, qtapp, local_only, config): + def __init__(self, common, qtapp, local_only): self.common = common self.qtapp = qtapp self.local_only = local_only - # Load settings, if a custom config was passed in - self.config = config - if self.config: - self.common.load_settings(self.config) - else: - self.common.load_settings() + # Load settings + self.common.load_settings() # Load strings strings.load_strings(self.common)