Merge lp:~charlesk/indicator-session/lp-1061844 into lp:indicator-session/12.10

[Charles Kerr]

Test upower_proxy for NULL before using it.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:367
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-ci/./label=quantal/19/console

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/session-menu-mgr.c'
--- src/session-menu-mgr.c	2012-10-01 17:39:38 +0000
+++ src/session-menu-mgr.c	2012-10-10 17:31:24 +0000
@@ -247,23 +247,27 @@
 static void
 on_upower_properties_changed (SessionMenuMgr * mgr)
 {
-  gboolean b;
   gboolean need_refresh = FALSE;
 
-  /* suspend */
-  b = dbus_upower_get_can_suspend (mgr->upower_proxy);
-  if (mgr->can_suspend != b)
-    {
-      mgr->can_suspend = b;
-      need_refresh = TRUE;
-    }
-
-  /* hibernate */
-  b = dbus_upower_get_can_hibernate (mgr->upower_proxy);
-  if (mgr->can_hibernate != b)
-    {
-      mgr->can_hibernate = b;
-      need_refresh = TRUE;
+  if (mgr->upower_proxy != NULL)
+    {
+      gboolean b;
+
+      /* suspend */
+      b = dbus_upower_get_can_suspend (mgr->upower_proxy);
+      if (mgr->can_suspend != b)
+        {
+          mgr->can_suspend = b;
+          need_refresh = TRUE;
+        }
+
+      /* hibernate */
+      b = dbus_upower_get_can_hibernate (mgr->upower_proxy);
+      if (mgr->can_hibernate != b)
+        {
+          mgr->can_hibernate = b;
+          need_refresh = TRUE;
+        }
     }
 
   if (need_refresh)