Merge lp:~charlesk/indicator-power/lp-1079795 into lp:indicator-power/13.04

[Charles Kerr]

explicitly cast integral values to the correct type when passing them to a varargs function.

Explicitly cast integral values to the correct type when passing them to a varargs function.

[Charles Kerr (charlesk)]

Changing to "Work in Progress" to tell Jenkins to wait a bit, because alesage is right now adding armhf to indicator-power's CI

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:158
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=quantal,flavor=amd64/18/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=quantal,flavor=i386/18/console

review: Approve (continuous-integration)

[Allan LeSage (allanlesage)]

Too late! I'll kick off again in a bit.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:158
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=quantal,flavor=amd64/19/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=quantal,flavor=armhf/19/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-ci/./build=pbuilder,distribution=quantal,flavor=i386/19/console

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good to me.

review: Approve

[Ted Gould (ted)]

Really, this is a case for not using the varargs function. But, since this is a test I don't think it's a big deal, approving.

review: Approve

=== modified file 'tests/test-device.cc'
--- tests/test-device.cc	2012-11-07 17:25:41 +0000
+++ tests/test-device.cc	2012-11-16 18:00:36 +0000
@@ -199,11 +199,11 @@
 
   GVariant * variant = g_variant_new ("(susdut)",
                                       "/object/path",
-                                      UP_DEVICE_KIND_BATTERY,
+                                      (guint32) UP_DEVICE_KIND_BATTERY,
                                       "icon",
-                                      50.0,
-                                      UP_DEVICE_STATE_CHARGING,
-                                      30);
+                                      (gdouble) 50.0,
+                                      (guint32) UP_DEVICE_STATE_CHARGING,
+                                      (guint64) 30);
   IndicatorPowerDevice * device = indicator_power_device_new_from_variant (variant);
   ASSERT_TRUE (variant != NULL);
   ASSERT_TRUE (device != NULL);