From 8bde3f5a65575a9df08e06c7d14cc00ba86cc731 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 26 Oct 2011 12:28:59 -0400 Subject: protect against rogue mpris or desktop name keys --- src/music-player-bridge.vala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/music-player-bridge.vala b/src/music-player-bridge.vala index 0c9cb10..e7bc1fb 100644 --- a/src/music-player-bridge.vala +++ b/src/music-player-bridge.vala @@ -229,14 +229,13 @@ public class MusicPlayerBridge : GLib.Object { var result = desktop_or_interface; var tokens = desktop_or_interface.split( "." ); - if ( tokens.length > 1 ){ + if (tokens != null && tokens.length > 1){ result = tokens[tokens.length - 1]; } var temp = result.split("-"); - if (temp.length > 1){ + if (temp != null && temp.length > 1){ result = temp[0]; } - debug("determine key result = %s", result); return result; } -- cgit v1.2.3 From c27acea44b7a4e073b74e7da1c072029e245ea3e Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 26 Oct 2011 12:30:16 -0400 Subject: update the ignore file with some new files --- .bzrignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.bzrignore b/.bzrignore index 6b177b5..e47e05c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -82,3 +82,9 @@ data/com.canonical.indicators.sound.gschema.valid tests/libmockpulse.la tests/libmockpulse_la-mockpulse.lo src/libsoundmenu_la-gen-sound-service.xml.lo +src/libsoundmenu_la-mute-widget.lo +src/libsoundmenu_la-sound-state-manager.lo +src/libsoundmenu_la-sound-state.lo +src/libsoundmenu_la-voip-input-widget.lo +src/specific-items-manager.c +src/stamp-marshal -- cgit v1.2.3