aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharles kerr <charlesk@canonical.com>2015-12-31 14:53:56 -0600
committercharles kerr <charlesk@canonical.com>2015-12-31 14:53:56 -0600
commitf94de8d944e0f10ca6f37d17fb4b0e5ab33a9b60 (patch)
treed8fb0a6676de70c61c3c0783d70dbd3a1bcdc989
parent787326bc59fb002cdf3231618f64e050d81a714a (diff)
downloadayatana-indicator-sound-f94de8d944e0f10ca6f37d17fb4b0e5ab33a9b60.tar.gz
ayatana-indicator-sound-f94de8d944e0f10ca6f37d17fb4b0e5ab33a9b60.tar.bz2
ayatana-indicator-sound-f94de8d944e0f10ca6f37d17fb4b0e5ab33a9b60.zip
fix references to unowned strings returned by Environment.get_variable()
-rw-r--r--src/service.vala2
-rw-r--r--src/volume-control-pulse.vala4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/service.vala b/src/service.vala
index 8615386..5009099 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -211,7 +211,7 @@ public class IndicatorSound.Service: Object {
}
void activate_desktop_settings (SimpleAction action, Variant? param) {
- var env = Environment.get_variable ("DESKTOP_SESSION");
+ unowned string env = Environment.get_variable ("DESKTOP_SESSION");
string cmd;
if (Environment.get_variable ("MIR_SOCKET") != null)
diff --git a/src/volume-control-pulse.vala b/src/volume-control-pulse.vala
index fe88dda..6021447 100644
--- a/src/volume-control-pulse.vala
+++ b/src/volume-control-pulse.vala
@@ -503,7 +503,7 @@ public class VolumeControlPulse : VolumeControl
this.context = new PulseAudio.Context (loop.get_api(), null, props);
this.context.set_state_callback (context_state_callback);
- var server_string = Environment.get_variable("PULSE_SERVER");
+ unowned string server_string = Environment.get_variable("PULSE_SERVER");
if (context.connect(server_string, Context.Flags.NOFAIL, null) < 0)
warning( "pa_context_connect() failed: %s\n", PulseAudio.strerror(context.errno()));
}
@@ -859,7 +859,7 @@ public class VolumeControlPulse : VolumeControl
yield setup_user_proxy ();
} else {
// We are in a user session. We just need our own proxy
- var username = Environment.get_variable ("USER");
+ unowned string username = Environment.get_variable ("USER");
if (username != "" && username != null) {
yield setup_user_proxy (username);
}