Merge lp:~charlesk/indicator-display/lp-1410915-fix-action-state-to-gsettings-mapping into lp:indicator-display/15.04

Proposed by Charles Kerr on 2015-03-01
Status: Merged
Approved by: Ted Gould on 2015-03-02
Approved revision: 13
Merged at revision: 13
Proposed branch: lp:~charlesk/indicator-display/lp-1410915-fix-action-state-to-gsettings-mapping
Merge into: lp:indicator-display/15.04
Diff against target: 12 lines (+1/-1)
1 file modified
src/rotation-lock.cpp (+1/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-display/lp-1410915-fix-action-state-to-gsettings-mapping
Reviewer Review Type Date Requested Status
Ted Gould (community) 2015-03-01 Approve on 2015-03-02
PS Jenkins bot (community) continuous-integration Approve on 2015-03-01
Review via email:

Commit message

Fix action-state-to-variant mapping

Description of the change

== Change Description

This indicator has a rotation-lock GAction whose boolean state is bound to a GSettings schema via g_settings_bind_with_mapping(). A bugfix in the mapping landed in rtm-14.09 r9 but wasn't proposed for trunk-15.04 until now.

== Checklist

> Are there any related MPs required for this MP to build/function as expected? Please list.


> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)


> Did the code build without warnings?


> Did the tests run successfully?


> Did you perform an exploratory manual test run of your code change and any related functionality?


> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?


> What device (or emulator) has your component test plan been executed successfully on?

mako vivid r116

> What manual tests are relevant for this MP?


To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/rotation-lock.cpp'
2--- src/rotation-lock.cpp 2014-10-09 13:44:12 +0000
3+++ src/rotation-lock.cpp 2015-03-01 00:37:28 +0000
4@@ -77,7 +77,7 @@
5 const GVariantType * /*expected_type*/,
6 gpointer /*unused*/)
7 {
8- return g_variant_new_boolean(g_value_get_boolean(value));
9+ return g_value_dup_variant(value);
10 }
12 GSimpleActionGroup* create_action_group()


People subscribed via source and target branches