Merge lp:~ted/indicator-session/upower-init-criticals into lp:indicator-session/12.10

[Ted Gould]

Move UPower settings init until after the items are created

If you're missing hibernate (like I am) and that happens at startup then having this in the _init will mean that you get a bunch of criticals on startup because the menu items aren't actually built yet. Moving it so the visibility is still correct, but the items exist.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:362
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/18/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/18/console

review: Needs Fixing (continuous-integration)

[Lars Karlitski (larsu)]

Makes sense, thanks.

review: Approve

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/session-menu-mgr.c'
--- src/session-menu-mgr.c	2012-09-18 16:09:15 +0000
+++ src/session-menu-mgr.c	2012-09-28 21:24:21 +0000
@@ -318,7 +318,6 @@
           g_clear_error (&error);
         }
 
-      on_upower_properties_changed (mgr);
       g_signal_connect_swapped (mgr->upower_proxy, "changed",
                                 G_CALLBACK(on_upower_properties_changed), mgr);
     }
@@ -1193,6 +1192,11 @@
   mgr->user_menuitem_index = n;
   update_user_menuitems (mgr);
   build_session_menuitems (mgr);
+
+  /* After we have the session menu items built we can look to
+     align them with UPower */
+  on_upower_properties_changed (mgr);
+
   return mgr;
 }