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

Proposed by Ted Gould
Status: Superseded
Proposed branch: lp:~ted/indicator-sound/phone-greeter-mute
Merge into: lp:indicator-sound/14.04
Diff against target: 34 lines (+3/-3)
2 files modified
src/service.vala (+1/-1)
tests/media-player-user.cc (+2/-2)
To merge this branch: bzr merge lp:~ted/indicator-sound/phone-greeter-mute
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michael Terry Approve
Review via email: mp+212721@code.launchpad.net

This proposal has been superseded by a proposal from 2014-03-26.

Commit message

Remove mute from the phone greeter

Description of the change

Make it look like the phone itself

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Looks sensible.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
437. By Ted Gould

Grab test suite fix for Jenkins

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/service.vala'
2--- src/service.vala 2014-03-21 19:34:52 +0000
3+++ src/service.vala 2014-03-26 18:48:34 +0000
4@@ -39,7 +39,7 @@
5
6 this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal);
7 this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS));
8- this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
9+ this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
10 this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE));
11 this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
12
13
14=== modified file 'tests/media-player-user.cc'
15--- tests/media-player-user.cc 2014-03-04 21:24:10 +0000
16+++ tests/media-player-user.cc 2014-03-26 18:48:34 +0000
17@@ -163,7 +163,7 @@
18 GIcon * out_icon = media_player_get_icon(MEDIA_PLAYER(player));
19 EXPECT_NE(nullptr, out_icon);
20 EXPECT_TRUE(g_icon_equal(in_icon, out_icon));
21- g_clear_object(&out_icon);
22+ // NOTE: No reference in 'out_icon' returned
23
24 MediaPlayerTrack * track = media_player_get_current_track(MEDIA_PLAYER(player));
25 EXPECT_NE(nullptr, track);
26@@ -171,7 +171,7 @@
27 EXPECT_STREQ("Bansky", media_player_track_get_artist(track));
28 EXPECT_STREQ("Vinyl is dead", media_player_track_get_album(track));
29 EXPECT_STREQ("http://art.url", media_player_track_get_art_url(track));
30- g_clear_object(&track);
31+ // NOTE: No reference in 'track' returned
32
33 g_clear_object(&in_icon);
34 g_clear_object(&player);

Subscribers

People subscribed via source and target branches