Merge lp:~mterry/indicator-sound/grab-greeter-name into lp:indicator-sound/14.04

Proposed by Michael Terry
Status: Merged
Approved by: Ted Gould
Approved revision: 439
Merged at revision: 440
Proposed branch: lp:~mterry/indicator-sound/grab-greeter-name
Merge into: lp:indicator-sound/14.04
Diff against target: 12 lines (+1/-1)
1 file modified
src/media-player-list-greeter.vala (+1/-1)
To merge this branch: bzr merge lp:~mterry/indicator-sound/grab-greeter-name
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email:

Commit message

Use correct dbus name for Unity Greeter.

Description of the change

Use correct name for Unity Greeter.

unity-greeter (on desktop) happens to claim com.canonical.Unity because it pretends to be Unity in order to implement the shutdown dialog.

But really, it provides its own name com.canonical.UnityGreeter that should be used. For example, unity8-greeter doesn't currently claim com.canonical.Unity so the media player bits won't work on it until this change.

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

Oh and I fixed a method prototype that should allow a null invalidated property list.

Revision history for this message
Michael Terry (mterry) wrote :

In 14.10 we should totally fix unity-greeter and we can clean this code a bit.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
438. By Michael Terry

Go back to useing correct name for unity greeter (especially in media player)

439. By Michael Terry

Drop minor null-allowed fix; let's not mix changes

Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/media-player-list-greeter.vala'
2--- src/media-player-list-greeter.vala 2014-03-03 19:28:24 +0000
3+++ src/media-player-list-greeter.vala 2014-04-01 21:13:33 +0000
4@@ -31,7 +31,7 @@
5 public MediaPlayerListGreeter () {
6 Bus.get_proxy.begin<UnityGreeterList> (
7 BusType.SESSION,
8- "com.canonical.Unity",
9+ "com.canonical.UnityGreeter",
10 "/list",
11 DBusProxyFlags.NONE,
12 null,


People subscribed via source and target branches