Merge lp:~azzar1/unity/fix-1059672 into lp:unity

[Andrea Azzarone]

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

== Problem ==
Cannot mount encrypted drives via launcher.

== Fix ==
Use GMountOperation in g_volume_mount.

== Test ==
Unit test added.

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

+1

review: Approve

=== modified file 'launcher/VolumeImp.cpp'
--- launcher/VolumeImp.cpp	2012-09-18 11:05:14 +0000
+++ launcher/VolumeImp.cpp	2012-10-02 16:38:22 +0000
@@ -150,9 +150,11 @@
 
   void MountAndOnFinishOpenInFileManager()
   {
+    glib::Object<GMountOperation> mount_op(gtk_mount_operation_new(nullptr));
+
     g_volume_mount(volume_,
                    (GMountMountFlags) 0,
-                   nullptr,
+                   mount_op,
                    nullptr,
                    (GAsyncReadyCallback) &Impl::OnMountFinish,
                    this);
 
=== modified file 'tests/gmockvolume.c'
--- tests/gmockvolume.c	2012-09-19 16:50:41 +0000
+++ tests/gmockvolume.c	2012-10-02 16:38:22 +0000
@@ -95,6 +95,7 @@
   mock_volume->label = g_strdup("");
   mock_volume->uuid = g_strdup_printf("%u", uuid);
   mock_volume->mount = NULL;
+  mock_volume->last_mount_had_mount_op = FALSE;
 }
 
 GMockVolume *
@@ -227,7 +228,10 @@
                      GAsyncReadyCallback  callback,
                      gpointer             user_data)
 {
-  g_mock_volume_set_mount(G_MOCK_VOLUME(volume), G_MOUNT(g_mock_mount_new()));
+  GMockVolume *mock_volume = G_MOCK_VOLUME(volume);
+
+  mock_volume->last_mount_had_mount_op = (mount_operation != NULL);
+  g_mock_volume_set_mount(mock_volume, G_MOUNT(g_mock_mount_new()));
 
   callback(NULL,
            G_ASYNC_RESULT (g_simple_async_result_new (NULL, NULL, NULL, NULL)),
@@ -282,6 +286,12 @@
   return NULL;
 }
 
+gboolean
+g_mock_volume_last_mount_had_mount_operation (GMockVolume* volume)
+{
+  return volume->last_mount_had_mount_op;
+}
+
 static void
 g_mock_volume_iface_init (GVolumeIface *iface)
 {
 
=== modified file 'tests/gmockvolume.h'
--- tests/gmockvolume.h	2012-09-18 10:25:57 +0000
+++ tests/gmockvolume.h	2012-10-02 16:38:22 +0000
@@ -45,6 +45,7 @@
   char *uuid;
   char *label;
   GMount *mount;
+  gboolean last_mount_had_mount_op;
 };
 
 struct _GMockVolumeClass {
@@ -61,6 +62,8 @@
 void          g_mock_volume_set_uuid  (GMockVolume *volume, const char *uuid);
 void          g_mock_volume_set_mount (GMockVolume *volume, GMount *mount);
 
+gboolean      g_mock_volume_last_mount_had_mount_operation (GMockVolume *volume);
+
 G_END_DECLS
 
 #endif // UNITYSHELL_G_MOCK_VOLUME_H
 
=== modified file 'tests/test_volume_imp.cpp'
--- tests/test_volume_imp.cpp	2012-09-18 11:05:14 +0000
+++ tests/test_volume_imp.cpp	2012-10-02 16:38:22 +0000
@@ -132,12 +132,14 @@
       .Times(1);
 
   volume_->MountAndOpenInFileManager();
+  EXPECT_EQ(g_mock_volume_last_mount_had_mount_operation(gvolume_), TRUE);
   EXPECT_TRUE(volume_->IsMounted());
 
   EXPECT_CALL(*file_manager_opener_, Open(ROOT_FILE_URI))
       .Times(1);
 
   volume_->MountAndOpenInFileManager();
+  EXPECT_EQ(g_mock_volume_last_mount_had_mount_operation(gvolume_), TRUE);
   EXPECT_TRUE(volume_->IsMounted());
 }