Merge lp:~ted/indicator-session/merge into lp:indicator-session/0.1

Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/indicator-session/merge
Merge into: lp:indicator-session/0.1
Diff against target: 21 lines (+2/-2)
1 file modified
src/session-service.c (+2/-2)
To merge this branch: bzr merge lp:~ted/indicator-session/merge
Reviewer Review Type Date Requested Status
David Barth Approve
Review via email: mp+20017@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Changes the names to match the current ones sent by upower

Revision history for this message
David Barth (dbarth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/session-service.c'
2--- src/session-service.c 2010-02-18 15:36:34 +0000
3+++ src/session-service.c 2010-02-25 17:44:15 +0000
4@@ -226,7 +226,7 @@
5 G_TYPE_STRING,
6 UP_INTERFACE,
7 G_TYPE_STRING,
8- "can-suspend",
9+ "CanSuspend",
10 G_TYPE_INVALID,
11 G_TYPE_VALUE,
12 G_TYPE_INVALID);
13@@ -242,7 +242,7 @@
14 G_TYPE_STRING,
15 UP_INTERFACE,
16 G_TYPE_STRING,
17- "can-hibernate",
18+ "CanHibernate",
19 G_TYPE_INVALID,
20 G_TYPE_VALUE,
21 G_TYPE_INVALID);

Subscribers

People subscribed via source and target branches