Merge lp:~ted/indicator-sound/phone-greeter-mute into lp:indicator-sound/14.04

[Ted Gould]

Remove mute from the phone greeter

Make it look like the phone itself

[Michael Terry (mterry)]

Looks sensible.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:436
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/126/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/66/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/65/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/126/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/indicator-sound/phone-greeter-mute]

437. By Ted Gould on 2014-03-26

Grab test suite fix for Jenkins

Unmerged revisions

=== modified file 'src/service.vala'
--- src/service.vala	2014-03-21 19:34:52 +0000
+++ src/service.vala	2014-03-26 18:48:34 +0000
@@ -39,7 +39,7 @@
 
 		this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal);
 		this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS));
-		this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
+		this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
 		this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE));
 		this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
 
 
=== modified file 'tests/media-player-user.cc'
--- tests/media-player-user.cc	2014-03-04 21:24:10 +0000
+++ tests/media-player-user.cc	2014-03-26 18:48:34 +0000
@@ -163,7 +163,7 @@
 	GIcon * out_icon = media_player_get_icon(MEDIA_PLAYER(player));
 	EXPECT_NE(nullptr, out_icon);
 	EXPECT_TRUE(g_icon_equal(in_icon, out_icon));
-	g_clear_object(&out_icon);
+	// NOTE: No reference in 'out_icon' returned
 
 	MediaPlayerTrack * track = media_player_get_current_track(MEDIA_PLAYER(player));
 	EXPECT_NE(nullptr, track);
@@ -171,7 +171,7 @@
 	EXPECT_STREQ("Bansky", media_player_track_get_artist(track));
 	EXPECT_STREQ("Vinyl is dead", media_player_track_get_album(track));
 	EXPECT_STREQ("http://art.url", media_player_track_get_art_url(track));
-	g_clear_object(&track);
+	// NOTE: No reference in 'track' returned
 
 	g_clear_object(&in_icon);
 	g_clear_object(&player);