Hide application icon when run under flatpak since it blocks access to those.

Author: saivert

Cargo.toml

@@ -3,6 +3,9 @@ name = "pwvucontrol"
 version = "0.4.3"
 edition = "2021"
 
+[features]
+sandboxed = []
+
 [dependencies]
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
 gtk = { version = "0.8.2", package = "gtk4", features = ["v4_12"]}

build-aux/com.saivert.pwvucontrol.json

@@ -67,10 +67,22 @@
             "name": "pwvucontrol",
             "builddir": true,
             "buildsystem": "meson",
+            "config-opts": [
+                "-Dsandboxed=true"
+            ],
             "sources": [
                 {
                     "type": "dir",
-                    "path": ".."
+                    "path": "..",
+                    "skip": [
+                        ".flatpak-builder",
+                        ".git",
+                        "builddir",
+                        ".github",
+                        "flatpak-build",
+                        "myrepo",
+                        "target"
+                    ]
                 }
             ]
         }

meson_options.txt

@@ -8,3 +8,10 @@ option(
   value: 'default',
   description: 'The build profile for pwvucontrol. One of "default" or "development".'
 )
+
+option(
+  'sandboxed',
+  type: 'boolean',
+  value: false,
+  description: 'If this is built to be run in a sandbox.'
+)

src/meson.build

@@ -25,6 +25,10 @@ else
   message('Building in debug mode')
 endif
 
+if get_option('sandboxed')
+  cargo_options += ['-Fsandboxed']
+endif
+
 cargo_env = [
   'CARGO_HOME=' + meson.project_build_root() / 'cargo-home',
   'CODEGEN_BUILD_DIR=' + meson.current_build_dir()

src/ui/volumebox.rs

@@ -80,7 +80,12 @@ mod imp {
             let item = self.node_object.borrow();
             let item = item.as_ref().cloned().unwrap();
 
-            self.icon.set_icon_name(Some(&item.iconname()));
+            // Flatpak blocks access to application icons, so hide the icon when run in the sandbox.
+            if cfg!(not(feature = "sandboxed")) {
+                self.icon.set_icon_name(Some(&item.iconname()));
+            } else {
+                self.icon.set_visible(false);
+            }
 
             item.bind_property("name", &self.title_label.get(), "label").sync_create().build();