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

[Charles Kerr]

Fix action-state-to-variant mapping

== 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.

No

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

Yes

> Did the code build without warnings?

Yes

> Did the tests run successfully?

Yes

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

Yes

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

N/A

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

mako vivid r116

> What manual tests are relevant for this MP?

indicator-display/rotation-indicator

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:13
http://jenkins.qa.ubuntu.com/job/indicator-display-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-display-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-display-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-display-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-display-ci/17/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/rotation-lock.cpp'
--- src/rotation-lock.cpp	2014-10-09 13:44:12 +0000
+++ src/rotation-lock.cpp	2015-03-01 00:37:28 +0000
@@ -77,7 +77,7 @@
                                             const GVariantType * /*expected_type*/,
                                             gpointer /*unused*/)
   {
-    return g_variant_new_boolean(g_value_get_boolean(value));
+    return g_value_dup_variant(value);
   }
  
   GSimpleActionGroup* create_action_group()