Merge lp:~charlesk/indicator-power/lp-1382861-fix-menu-creation-test into lp:indicator-power/15.10

[Charles Kerr]

Fix timing issue that caused "Adjust brightness automatically" menuitem to sometimes not be shown.

== Description of Change

Fix timing issue that caused "Adjust brightness automatically" menuitem to sometimes not be shown.

The rebuild_now() method checked to see if menus were built by testing the session bus pointer for NULL because, in earlier versions, menus were created and exported when the session bus was acquired. Menu creation comes earlier now, so this test can give a false negative.

This patch replaces the NULL pointer test with a simple "menus_created" flag.

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

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

> Did your component test plan pass? If on a device, what image number?

Yes, krillin r277

> Please list which manual tests are germane for the reviewer in this MR.

This was an infrequent timing bug with no manual tests other than confirming that the "Adjust brightness automatically" checkbox is present on the phone.

> Did you provide a link to this page https://wiki.ubuntu.com/Process/Merges/Checklists/indicator-power

Yes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:285
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-vivid-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-vivid-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-vivid-armhf-ci/9/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[dobey (dobey)]

Looks ok to me.

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2015-04-02 20:30:59 +0000
+++ src/service.c	2015-05-14 22:19:37 +0000
@@ -110,6 +110,7 @@
   guint actions_export_id;
   GDBusConnection * conn;
 
+  gboolean menus_built;
   struct ProfileMenuInfo menus[N_PROFILES];
 
   GSimpleActionGroup * actions;
@@ -674,7 +675,7 @@
       g_simple_action_set_state (p->header_action, create_header_state (self));
     }
 
-  if (p->conn == NULL) /* we haven't built the menus yet */
+  if (!p->menus_built)
     return;
 
   if (sections & SECTION_DEVICES)
@@ -1184,6 +1185,7 @@
 
   for (i=0; i<N_PROFILES; ++i)
     create_menu(self, i);
+  p->menus_built = TRUE;
 
   g_signal_connect_swapped(p->brightness, "notify::auto-brightness-supported",
                            G_CALLBACK(on_auto_brightness_supported_changed), self);