Merge ~muktupavels/ubuntu/+source/gnome-session:upstart into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master

Proposed by Alberts Muktupāvels
Status: Merged
Merged at revision: 06406b2db53f743b982402a73a66113b806cbd71
Proposed branch: ~muktupavels/ubuntu/+source/gnome-session:upstart
Merge into: ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Diff against target: 10 lines (+1/-1)
1 file modified
debian/data/gnome-session.service (+1/-1)
Reviewer Review Type Date Requested Status
Iain Lane Approve
Ubuntu Desktop Pending
Review via email: mp+362976@code.launchpad.net

Commit message

gnome-session.service: Don't spam logs with dbus-send usage

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

Thanks, seems like a good idea, but please look at my comment.

review: Needs Fixing
Revision history for this message
Alberts Muktupāvels (muktupavels) wrote :

> Thanks, seems like a good idea, but please look at my comment.

Done.

Revision history for this message
Iain Lane (laney) wrote :

👍

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/data/gnome-session.service b/debian/data/gnome-session.service
2index 5582a14..0697ee3 100644
3--- a/debian/data/gnome-session.service
4+++ b/debian/data/gnome-session.service
5@@ -8,4 +8,4 @@ ExecStart=/bin/sh -exc '[ "$DESKTOP_SESSION" != "gnome-classic" ] || export GNOM
6 [ "$DESKTOP_SESSION" = gnome-flashback-metacity ] && \
7 exec gnome-session --session=$DESKTOP_SESSION --disable-acceleration-check || \
8 exec gnome-session --session=$DESKTOP_SESSION'
9-ExecStopPost=-/bin/sh -xc '[ "${XDG_SESSION_PATH}" = "${GNOME_SESSION_XDG_SESSION_PATH}" ] && /usr/bin/dbus-send --type=method_call --address=${UPSTART_SESSION} /com/ubuntu/Upstart com.ubuntu.Upstart0_6.EndSession'
10+ExecStopPost=-/bin/sh -xc '[ "${XDG_SESSION_PATH}" = "${GNOME_SESSION_XDG_SESSION_PATH}" ] && [ "${UPSTART_SESSION}" ] && /usr/bin/dbus-send --type=method_call --address="${UPSTART_SESSION}" /com/ubuntu/Upstart com.ubuntu.Upstart0_6.EndSession'

Subscribers

People subscribed via source and target branches