[gnome-settings-daemon/gnome-3-8] updates: Really cancel tasks on shutdown

[Bastien Nocera <hadess src gnome org>]

commit a15b0246e30271009a22d63810c153e8bbe4dbb2
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Mar 8 11:19:35 2013 +0100

    updates: Really cancel tasks on shutdown
    
    Conflicts:
        plugins/updates/gsd-updates-manager.c

 plugins/updates/gsd-updates-manager.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
index 9e9ff17..7b8943d 100644
--- a/plugins/updates/gsd-updates-manager.c
+++ b/plugins/updates/gsd-updates-manager.c
@@ -1375,7 +1375,10 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager)
         g_clear_object (&manager->priv->firmware);
         g_clear_object (&manager->priv->proxy_session);
         g_clear_object (&manager->priv->volume_monitor);
-        g_clear_object (&manager->priv->cancellable);
+        if (manager->priv->cancellable) {
+                g_cancellable_cancel (manager->priv->cancellable);
+                g_clear_object (&manager->priv->cancellable);
+        }
         if (manager->priv->update_viewer_watcher_id != 0) {
                 g_bus_unwatch_name (manager->priv->update_viewer_watcher_id);
                 manager->priv->update_viewer_watcher_id = 0;