Do Plugins

Merge lp://qastaging/~jpds/do-plugins/session-dbus-fixes into lp://qastaging/do-plugins

  1. session-dbus-fixes
  2. Merge into trunk
Proposed by Jonathan Davies
Status: Merged
Approved by: Alex Launi
Approved revision: 659
Merged at revision: 659
Proposed branch: lp://qastaging/~jpds/do-plugins/session-dbus-fixes
Merge into: lp://qastaging/do-plugins
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~jpds/do-plugins/session-dbus-fixes
Reviewer Review Type Date Requested Status
Alex Launi (community) Approve
Review via email: mp+12098@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Davies (jpds) wrote :

This branch fixes D-Bus changes in Ubuntu Karmic (notably org.gnome.PowerManagement to DeviceKit).

Revision history for this message
Alex Launi (alexlauni) wrote :

Looks good. Thanks a lot for fixing this!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'GNOME-Session/src/PowerManagement.cs'
2--- GNOME-Session/src/PowerManagement.cs 2009-05-17 07:43:33 +0000
3+++ GNOME-Session/src/PowerManagement.cs 2009-09-18 20:17:57 +0000
4@@ -30,21 +30,21 @@
5
6 class PowerManagement
7 {
8- [Interface ("org.freedesktop.PowerManagement")]
9+ [Interface ("org.freedesktop.DeviceKit.Power")]
10 interface IPowerManagementProxy
11 {
12 void Hibernate ();
13 void Suspend ();
14 }
15
16- const string BusName = "org.freedesktop.PowerManagement";
17- const string ObjectPath = "/org/freedesktop/PowerManagement";
18+ const string BusName = "org.freedesktop.DeviceKit.Power";
19+ const string ObjectPath = "/org/freedesktop/DeviceKit/Power";
20
21 static IPowerManagementProxy BusInstance
22 {
23 get {
24 try {
25- return Bus.Session.GetObject<IPowerManagementProxy> (BusName, new ObjectPath (ObjectPath));
26+ return Bus.System.GetObject<IPowerManagementProxy> (BusName, new ObjectPath (ObjectPath));
27 } catch (Exception e) {
28 Log<PowerManagement>.Error ("Could not get PowerManagement bus object: {0}", e.Message);
29 Log<PowerManagement>.Debug (e.StackTrace);

Subscribers

People subscribed via source and target branches