[gnome-settings-daemon/gnome-3-18] media-keys: Fix screen lock call not being cancelled

[Bastien Nocera <hadess src gnome org>]

commit d27d94498021312c8f0cad30470b33cefb19c49b
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Mar 15 14:58:25 2016 +0100

    media-keys: Fix screen lock call not being cancelled
    
    Because we used the wrong cancellable, it was possible for it not to
    exist and the call not being cancelled. As we only used the return value
    from the call, this shouldn't cause any crashes.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763689

 plugins/media-keys/gsd-media-keys-manager.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 5e4b467..ae34db9 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -195,7 +195,7 @@ struct GsdMediaKeysManagerPrivate
         GDBusConnection *connection;
         GCancellable    *bus_cancellable;
         GDBusProxy      *xrandr_proxy;
-        GCancellable    *cancellable;
+        GCancellable    *cancellable; /* Only used for XRandR operations */
 
         guint            start_idle_id;
 
@@ -979,7 +979,7 @@ do_lock_screensaver (GsdMediaKeysManager *manager)
                 priv->screen_saver_proxy = gnome_settings_bus_get_screen_saver_proxy ();
 
         gsd_screen_saver_call_lock (priv->screen_saver_proxy,
-                                    priv->cancellable,
+                                    priv->bus_cancellable,
                                     (GAsyncReadyCallback) on_screen_locked,
                                     manager);
 }