Merge lp:~ken-vandine/indicator-session/lp_858798 into lp:indicator-session/0.1

Proposed by Ken VanDine on 2011-10-03
Status: Merged
Approved by: Ted Gould on 2011-10-12
Approved revision: 223
Merged at revision: 223
Proposed branch: lp:~ken-vandine/indicator-session/lp_858798
Merge into: lp:indicator-session/0.1
Diff against target: 13 lines (+4/-4)
1 file modified
data/indicator-session.convert (+4/-4)
To merge this branch: bzr merge lp:~ken-vandine/indicator-session/lp_858798
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve on 2011-10-03
Indicator Applet Developers 2011-10-03 Pending
Review via email: mp+77952@code.launchpad.net

Description of the change

Fixed improperly mapped gconf to gsettings keys, fixes crasher (LP: #858798)

To post a comment you must log in.
Andrea Cimitan (cimi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/indicator-session.convert'
2--- data/indicator-session.convert 2011-09-21 20:23:26 +0000
3+++ data/indicator-session.convert 2011-10-03 14:32:35 +0000
4@@ -1,5 +1,5 @@
5 [com.canonical.indicator.session]
6-suppress_logout_restart_shutdown = /apps/indicator-session/suppress-logout-restart-shutdown
7-suppress_logout_menuitem = /apps/indicator-session/suppress-logout-menuitem
8-suppress_restart_menuitem = /apps/indicator-session/suppress-restart-menuitem
9-suppress_shutdown_menuitem = /apps/indicator-session/suppress-shutdown-menuitem
10+suppress-logout-restart-shutdown = /apps/indicator-session/suppress_logout_restart_shutdown
11+suppress-logout-menuitem = /apps/indicator-session/suppress_logout_menuitem
12+suppress-restart-menuitem = /apps/indicator-session/suppress_restart_menuitem
13+suppress-shutdown-menuitem = /apps/indicator-session/suppress_shutdown_menuitem

Subscribers

People subscribed via source and target branches