commit 480a7c13406cf12a0cd71910a8b36c9c48a6c0c4 Author: Yawning Angel <yawning@schwanenlied.me> Date: Wed Dec 21 06:02:51 2016 +0000 Remove the unused `pulseAudioBox` identifier. --- ChangeLog | 1 + data/ui/gtkui.ui | 2 +- src/cmd/sandboxed-tor-browser/internal/ui/gtk/config.go | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d9cb6f..f68edb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ Changes in version 0.0.3 - UNRELEASED: on certain pages. * Bug 20973: Silence Gdk warnings on systems with integrated png loader. * Bug 20806: Try even harder to exclude gstreamer. + * Remove the unused `pulseAudioBox` identifier. * Set the security slider to "High" by default on a fresh install. * Store the version of the sandbox in the config file, and re-Sync() the config, and reinstall the `mozilla.cfg` when things change. diff --git a/data/ui/gtkui.ui b/data/ui/gtkui.ui index 991268a..eb453d3 100644 --- a/data/ui/gtkui.ui +++ b/data/ui/gtkui.ui @@ -519,7 +519,7 @@ <property name="margin_bottom">6</property> <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="pulseAudioBox"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">6</property> diff --git a/src/cmd/sandboxed-tor-browser/internal/ui/gtk/config.go b/src/cmd/sandboxed-tor-browser/internal/ui/gtk/config.go index f5519fe..36799e8 100644 --- a/src/cmd/sandboxed-tor-browser/internal/ui/gtk/config.go +++ b/src/cmd/sandboxed-tor-browser/internal/ui/gtk/config.go @@ -60,7 +60,6 @@ type configDialog struct { torSystemIndicator *gtk3.Box // Sandbox config elements. - pulseAudioBox *gtk3.Box pulseAudioSwitch *gtk3.Switch avCodecSwitch *gtk3.Switch circuitDisplaySwitch *gtk3.Switch @@ -109,7 +108,6 @@ func (d *configDialog) loadFromConfig() { d.torConfigBox.SetSensitive(!d.ui.Cfg.UseSystemTor) d.torSystemIndicator.SetVisible(d.ui.Cfg.UseSystemTor) - // XXX: Hide PulseAudio option if not available. forceAdv := false d.pulseAudioSwitch.SetActive(d.ui.Cfg.Sandbox.EnablePulseAudio) d.avCodecSwitch.SetActive(d.ui.Cfg.Sandbox.EnableAVCodec) @@ -375,9 +373,6 @@ func (ui *gtkUI) initConfigDialog(b *gtk3.Builder) error { } // Sandbox config elements. - if d.pulseAudioBox, err = getBox(b, "pulseAudioBox"); err != nil { - return err - } if d.pulseAudioSwitch, err = getSwitch(b, "pulseAudioSwitch"); err != nil { return err }