diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-12-22 15:43:02 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-12-22 15:43:02 +0100 |
| commit | 4634e4025626c9d8d9edc7bd1d1980e75d0c5ec4 (patch) | |
| tree | 805d49f174faafd78f92cc5af1371c1c78c8bbb3 /src | |
| parent | 50669befbdd325a3f8bd115152c00b72f5a2e8c5 (diff) | |
| parent | 85de6718e008d628b84595ff2ca9e1ec86b54eaa (diff) | |
| download | ayatana-indicator-bluetooth-4634e4025626c9d8d9edc7bd1d1980e75d0c5ec4.tar.gz ayatana-indicator-bluetooth-4634e4025626c9d8d9edc7bd1d1980e75d0c5ec4.tar.bz2 ayatana-indicator-bluetooth-4634e4025626c9d8d9edc7bd1d1980e75d0c5ec4.zip | |
Merge branch 'tari01-pr/do-not-hide-the-indicator'
Attributes GH PR #16: https://github.com/AyatanaIndicators/ayatana-indicator-bluetooth/pull/16
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop.vala | 9 | ||||
| -rw-r--r-- | src/killswitch.vala | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/desktop.vala b/src/desktop.vala index f576144..ea3a806 100644 --- a/src/desktop.vala +++ b/src/desktop.vala @@ -64,9 +64,12 @@ class Desktop: Profile build_menu (); // know when to show the indicator & when to hide it - settings.changed["visible"].connect (()=> update_visibility()); - bluetooth.notify["supported"].connect (() => update_visibility()); - update_visibility (); + if (Environment.get_variable("MIR_SOCKET") != null) + { + settings.changed["visible"].connect (()=> update_visibility()); + bluetooth.notify["supported"].connect (() => update_visibility()); + update_visibility (); + } // when devices change, rebuild our device section bluetooth.devices_changed.connect (()=> { diff --git a/src/killswitch.vala b/src/killswitch.vala index 4ed87e9..0b900c0 100644 --- a/src/killswitch.vala +++ b/src/killswitch.vala @@ -129,7 +129,7 @@ public class RfKillSwitch: KillSwitch, Object var event = Linux.RfKillEvent(); var n = sizeof (Linux.RfKillEvent); var bytesread = Posix.read (fd, &event, n); - + if (bytesread == n) { process_event (event); |