Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --color -Naru Bottles-51.21-orig/bottles/frontend/meson.build Bottles-51.21/bottles/frontend/meson.build
- --- Bottles-51.21-orig/bottles/frontend/meson.build 2025-03-24 00:34:04.273862142 +0800
- +++ Bottles-51.21/bottles/frontend/meson.build 2025-03-24 01:43:55.290633603 +0800
- @@ -25,9 +25,9 @@
- fs = import('fs')
- -if not fs.is_file('/' + '.flatpak-info')
- - error('file does not exist')
- -endif
- +# if not fs.is_file('/' + '.flatpak-info')
- +# error('file does not exist')
- +# endif
- bottles_sources = [
- '__init__.py',
- diff --color -Naru Bottles-51.21-orig/bottles/frontend/views/bottle_dependencies.py Bottles-51.21/bottles/frontend/views/bottle_dependencies.py
- --- Bottles-51.21-orig/bottles/frontend/views/bottle_dependencies.py 2025-03-24 00:34:04.280820281 +0800
- +++ Bottles-51.21/bottles/frontend/views/bottle_dependencies.py 2025-03-24 01:44:42.015363727 +0800
- @@ -138,6 +138,6 @@
- for dep in self.config.Installed_Dependencies:
- if dep in dependencies:
- dep = (dep, dependencies[dep])
- - GLib.idle_add(new_dependency, dep, plain=True)
- + GLib.idle_add(new_dependency, dep)
- RunAsync(process_dependencies, callback=callback)
- diff --color -Naru Bottles-51.21-orig/bottles/frontend/views/bottle_details.py Bottles-51.21/bottles/frontend/views/bottle_details.py
- --- Bottles-51.21-orig/bottles/frontend/views/bottle_details.py 2025-03-24 00:34:04.280861203 +0800
- +++ Bottles-51.21/bottles/frontend/views/bottle_details.py 2025-03-24 01:43:55.290877248 +0800
- @@ -436,20 +436,20 @@
- dialog.connect("response", execute)
- dialog.show()
- - if Xdp.Portal.running_under_sandbox():
- - if self.window.settings.get_boolean("show-sandbox-warning"):
- - dialog = Adw.MessageDialog.new(
- - self.window,
- - _("Be Aware of Sandbox"),
- - _(
- - "Bottles is running in a sandbox, a restricted permission environment needed to keep you safe. If the program won't run, consider moving inside the bottle (3 dots icon on the top), then launch from there."
- - ),
- - )
- - dialog.add_response("dismiss", _("_Dismiss"))
- - dialog.connect("response", show_chooser)
- - dialog.present()
- - else:
- - show_chooser()
- + # if Xdp.Portal.running_under_sandbox():
- + if self.window.settings.get_boolean("show-sandbox-warning"):
- + dialog = Adw.MessageDialog.new(
- + self.window,
- + _("Be Aware of Sandbox"),
- + _(
- + "Bottles is running in a sandbox, a restricted permission environment needed to keep you safe. If the program won't run, consider moving inside the bottle (3 dots icon on the top), then launch from there."
- + ),
- + )
- + dialog.add_response("dismiss", _("_Dismiss"))
- + dialog.connect("response", show_chooser)
- + dialog.present()
- + else:
- + show_chooser()
- def __backup(self, widget, backup_type):
- """
- diff --color -Naru Bottles-51.21-orig/bottles/frontend/views/bottle_preferences.py Bottles-51.21/bottles/frontend/views/bottle_preferences.py
- --- Bottles-51.21-orig/bottles/frontend/views/bottle_preferences.py 2025-03-24 00:34:04.280861203 +0800
- +++ Bottles-51.21/bottles/frontend/views/bottle_preferences.py 2025-03-24 01:43:55.291390026 +0800
- @@ -139,8 +139,8 @@
- self.queue = details.queue
- self.details = details
- - if not gamemode_available or not Xdp.Portal.running_under_sandbox():
- - return
- + # if not gamemode_available or not Xdp.Portal.running_under_sandbox():
- + # return
- _not_available = _("This feature is unavailable on your system.")
- _flatpak_not_available = _(
- diff --color -Naru Bottles-51.21-orig/bottles/frontend/views/list.py Bottles-51.21/bottles/frontend/views/list.py
- --- Bottles-51.21-orig/bottles/frontend/views/list.py 2025-03-24 00:34:04.281861069 +0800
- +++ Bottles-51.21/bottles/frontend/views/list.py 2025-03-24 01:43:55.291916352 +0800
- @@ -82,8 +82,8 @@
- def run_executable(self, *_args):
- """Display file dialog for executable"""
- - if not Xdp.Portal.running_under_sandbox():
- - return
- + # if not Xdp.Portal.running_under_sandbox():
- + # return
- def set_path(_dialog, response):
- if response != Gtk.ResponseType.ACCEPT:
- diff --color -Naru Bottles-51.21-orig/bottles/frontend/views/new_bottle_dialog.py Bottles-51.21/bottles/frontend/views/new_bottle_dialog.py
- --- Bottles-51.21-orig/bottles/frontend/views/new_bottle_dialog.py 2025-03-24 00:34:04.281861069 +0800
- +++ Bottles-51.21/bottles/frontend/views/new_bottle_dialog.py 2025-03-24 01:43:55.292209648 +0800
- @@ -80,7 +80,8 @@
- super().__init__(**kwargs)
- # common variables and references
- self.window = GtkUtils.get_parent_window()
- - if not self.window or not Xdp.Portal.running_under_sandbox():
- + # if not self.window or not Xdp.Portal.running_under_sandbox():
- + if not self.window:
- return
- self.app = self.window.get_application()
- diff --color -Naru Bottles-51.21-orig/bottles/frontend/windows/window.py Bottles-51.21/bottles/frontend/windows/window.py
- --- Bottles-51.21-orig/bottles/frontend/windows/window.py 2025-03-24 00:34:04.286860397 +0800
- +++ Bottles-51.21/bottles/frontend/windows/window.py 2025-03-24 01:43:55.292499312 +0800
- @@ -97,34 +97,34 @@
- manager = Adw.StyleManager.get_default()
- manager.set_color_scheme(Adw.ColorScheme.FORCE_DARK)
- - # Be VERY explicit that non-sandboxed environments are unsupported
- - if not Xdp.Portal.running_under_sandbox():
- + # # Be VERY explicit that non-sandboxed environments are unsupported
- + # if not Xdp.Portal.running_under_sandbox():
- - def response(dialog, response, *args):
- - if response == "close":
- - quit(1)
- -
- - body = _(
- - "Bottles is only supported within a sandboxed environment. Official sources of Bottles are available at"
- - )
- - download_url = "usebottles.com/download"
- -
- - error_dialog = Adw.AlertDialog.new(
- - _("Unsupported Environment"),
- - f"{body} <a href='https://{download_url}' title='https://{download_url}'>{download_url}.</a>",
- - )
- -
- - error_dialog.add_response("close", _("Close"))
- - error_dialog.set_body_use_markup(True)
- - error_dialog.connect("response", response)
- - error_dialog.present(self)
- - logging.error(
- - _(
- - "Bottles is only supported within a sandboxed format. Official sources of Bottles are available at:"
- - )
- - )
- - logging.error("https://usebottles.com/download/")
- - return
- + # def response(dialog, response, *args):
- + # if response == "close":
- + # quit(1)
- +
- + # body = _(
- + # "Bottles is only supported within a sandboxed environment. Official sources of Bottles are available at"
- + # )
- + # download_url = "usebottles.com/download"
- +
- + # error_dialog = Adw.AlertDialog.new(
- + # _("Unsupported Environment"),
- + # f"{body} <a href='https://{download_url}' title='https://{download_url}'>{download_url}.</a>",
- + # )
- +
- + # error_dialog.add_response("close", _("Close"))
- + # error_dialog.set_body_use_markup(True)
- + # error_dialog.connect("response", response)
- + # error_dialog.present(self)
- + # logging.error(
- + # _(
- + # "Bottles is only supported within a sandboxed format. Official sources of Bottles are available at:"
- + # )
- + # )
- + # logging.error("https://usebottles.com/download/")
- + # return
- # Loading view
- self.page_loading = LoadingView()
Advertisement
Add Comment
Please, Sign In to add comment