Merge lp:~3v1n0/unity/cancellable-volume-6.0 into lp:unity/6.0

[Marco Trevisan (Treviño)]

VolumeImp: use GCancellable to perform glib async operations

Backported lp:~3v1n0/unity/cancellable-volume/+merge/128704 to unity-6.0

[Nick Dedekind (nick-dedekind)]

LGTM

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1518/console reported an error when processing this lp:~3v1n0/unity/cancellable-volume-6.0 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1519/console reported an error when processing this lp:~3v1n0/unity/cancellable-volume-6.0 branch.
Not merging it.

=== modified file 'launcher/VolumeImp.cpp'
--- launcher/VolumeImp.cpp	2012-10-02 17:09:55 +0000
+++ launcher/VolumeImp.cpp	2012-10-09 13:31:25 +0000
@@ -127,7 +127,7 @@
     g_volume_eject_with_operation(volume_,
                                   (GMountUnmountFlags)0,
                                   mount_op,
-                                  nullptr,
+                                  cancellable_,
                                   (GAsyncReadyCallback)OnEjectReady,
                                   this);
   }
@@ -155,7 +155,7 @@
     g_volume_mount(volume_,
                    (GMountMountFlags) 0,
                    mount_op,
-                   nullptr,
+                   cancellable_,
                    (GAsyncReadyCallback) &Impl::OnMountFinish,
                    this);
   }
@@ -195,7 +195,7 @@
     g_drive_stop(drive,
                  (GMountUnmountFlags)0,
                  mount_op,
-                 nullptr, nullptr, nullptr);
+                 cancellable_, nullptr, nullptr);
   }
 
   void Unmount()
@@ -209,7 +209,7 @@
     g_mount_unmount_with_operation(mount,
                                    (GMountUnmountFlags)0,
                                    op,
-                                   nullptr, nullptr, nullptr);
+                                   cancellable_, nullptr, nullptr);
   }
 
   VolumeImp* parent_;