Merge lp:~cjcurran/indicator-sound/odd-determine-key-crash into lp:indicator-sound/fourth

[Conor Curran]

fixes attached bug

=== modified file '.bzrignore'
--- .bzrignore	2011-01-11 10:42:06 +0000
+++ .bzrignore	2011-10-26 16:45:35 +0000
@@ -82,3 +82,9 @@
 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
 
=== modified file 'src/music-player-bridge.vala'
--- src/music-player-bridge.vala	2011-09-09 17:47:00 +0000
+++ src/music-player-bridge.vala	2011-10-26 16:45:35 +0000
@@ -229,14 +229,13 @@
   {
     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;        
   }