Merge lp:~azzar1/unity/fix-713432-5.0 into lp:unity/5.0

[Andrea Azzarone]

Use GMountOperation in g_volume_mount. GMountOperation provides a mechanism for interacting with the use.

== Problem ==
Unity launcher doesn't prompt for password to unlock the device when clicking on a encrypted volume icon.

== Fix ==
Let's use GMountOperation.

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1507/console reported an error when processing this lp:~andyrock/unity/fix-713432-5.0 branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1508/console reported an error when processing this lp:~andyrock/unity/fix-713432-5.0 branch.
Not merging it.

=== modified file 'plugins/unityshell/src/DeviceLauncherIcon.cpp'
--- plugins/unityshell/src/DeviceLauncherIcon.cpp	2012-06-22 17:21:20 +0000
+++ plugins/unityshell/src/DeviceLauncherIcon.cpp	2012-10-02 17:19:30 +0000
@@ -300,12 +300,16 @@
   if (G_IS_MOUNT(mount.RawPtr()))
     ShowMount(mount);
   else
+  {
+    glib::Object<GMountOperation> mount_op(gtk_mount_operation_new(nullptr));
+
     g_volume_mount(volume_,
                    (GMountMountFlags)0,
-                   NULL,
+                   mount_op,
                    NULL,
                    (GAsyncReadyCallback)&DeviceLauncherIcon::OnMountReady,
                    this);
+  }
 }
 
 void DeviceLauncherIcon::OnMountReady(GObject* object,