[gnome-control-center/gnome-3-4] power: Use GCancellable better, to avoid a crash

[Michael Terry <mterry src gnome org>]

commit 1801b2f4648b3e89b11cde7023c0046a98a0f1f1
Author: Michael Terry <michael terry canonical com>
Date:   Mon Sep 10 14:24:12 2012 -0400

    power: Use GCancellable better, to avoid a crash
    
    https://bugzilla.gnome.org/show_bug.cgi?id=683533

 panels/power/cc-power-panel.c |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
index 2c4f4ef..adec5ac 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -92,6 +92,7 @@ cc_power_panel_dispose (GObject *object)
     }
   if (priv->cancellable != NULL)
     {
+      g_cancellable_cancel (priv->cancellable);
       g_object_unref (priv->cancellable);
       priv->cancellable = NULL;
     }
@@ -115,14 +116,6 @@ cc_power_panel_dispose (GObject *object)
 }
 
 static void
-cc_power_panel_finalize (GObject *object)
-{
-  CcPowerPanelPrivate *priv = CC_POWER_PANEL (object)->priv;
-  g_cancellable_cancel (priv->cancellable);
-  G_OBJECT_CLASS (cc_power_panel_parent_class)->finalize (object);
-}
-
-static void
 on_lock_settings_changed (GSettings     *settings,
                           const char    *key,
                           CcPowerPanel *panel)
@@ -139,7 +132,6 @@ cc_power_panel_class_init (CcPowerPanelClass *klass)
   object_class->get_property = cc_power_panel_get_property;
   object_class->set_property = cc_power_panel_set_property;
   object_class->dispose = cc_power_panel_dispose;
-  object_class->finalize = cc_power_panel_finalize;
 }
 
 static void
@@ -636,8 +628,8 @@ add_device_secondary (CcPowerPanel *panel,
 static void
 get_devices_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
-  CcPowerPanel *panel = CC_POWER_PANEL (user_data);
-  CcPowerPanelPrivate *priv = panel->priv;
+  CcPowerPanel *panel;
+  CcPowerPanelPrivate *priv;
   gboolean got_primary = FALSE;
   gboolean ups_as_primary_device = FALSE;
   GError *error = NULL;
@@ -653,6 +645,16 @@ get_devices_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
   UpDeviceKind kind;
   UpDeviceState state;
 
+  result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error);
+  if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+    {
+      g_error_free (error);
+      return; /* Must exit before accessing freed memory */
+    }
+
+  panel = CC_POWER_PANEL (user_data);
+  priv = panel->priv;
+
   /* empty the secondary box */
   widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
                                                "grid_secondary"));
@@ -669,7 +671,6 @@ get_devices_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
                                                "box_secondary"));
   gtk_widget_hide (widget);
 
-  result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), res, &error);
   if (result == NULL)
     {
       g_printerr ("Error getting devices: %s\n", error->message);
@@ -768,16 +769,22 @@ static void
 got_power_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
 {
   GError *error = NULL;
-  CcPowerPanelPrivate *priv = CC_POWER_PANEL (user_data)->priv;
+  GDBusProxy *proxy;
+  CcPowerPanelPrivate *priv;
 
-  priv->proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
-  if (priv->proxy == NULL)
+  proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
+  if (proxy == NULL)
     {
       g_printerr ("Error creating proxy: %s\n", error->message);
       g_error_free (error);
       return;
     }
 
+  /* Access user_data after checking for error because user_data might be
+     disposed already. */
+  priv = CC_POWER_PANEL (user_data)->priv;
+  priv->proxy = proxy;
+
   /* we want to change the primary device changes */
   g_signal_connect (priv->proxy,
                     "g-properties-changed",