Merge lp:~3v1n0/unity/volume-icon-dnd into lp:unity

[Marco Trevisan (Treviño)]

VolumeLauncherIcon: copy files to device on DnD

Use filemanager to perform the copy action. If needed, delay the procedure until we
don't have the volume mounted (using a magic utility function to share the code).

[Andrea Azzarone (azzar1)]

Why not using g_file_copy_*?

review: Needs Information

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

> Why not using g_file_copy_*?

Because using it would have needed to add a progress handler inside unity (progress bar over the icon + quicklist items to manage it?) separated to the nautilus one.
Using nautilus, we get instead for free the ability to copy files having a progress dialog and a dialog handling the file conflicts. All this keeping the consistency with the normal copy operation we'd have using the system tools.

So, until we don't reimplement all this inside unity, I think that using the environment facilities is better.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3571
http://10.97.0.26:8080/job/unity-ci/424/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/unity-saucy-amd64-ci/313
    SUCCESS: http://10.97.0.26:8080/job/unity-saucy-armhf-ci/311
    SUCCESS: http://10.97.0.26:8080/job/unity-saucy-i386-ci/312

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/424/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3572
http://jenkins.qa.ubuntu.com/job/unity-ci/425/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/312
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/313

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/425/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

Ok makes sense :D

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-10-04 03:55:52 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-10-07 22:37:56 +0000
@@ -1112,16 +1112,6 @@
   return _remote_uri;
 }
 
-std::set<std::string> ApplicationLauncherIcon::ValidateUrisForLaunch(DndData const& uris)
-{
-  std::set<std::string> result;
-
-  for (auto uri : uris.Uris())
-    result.insert(uri);
-
-  return result;
-}
-
 void ApplicationLauncherIcon::OnDndHovered()
 {
   // for now, let's not do this, it turns out to be quite buggy
@@ -1159,7 +1149,7 @@
 {
   if (IsFileManager())
   {
-    for (auto uri : dnd_data.Uris())
+    for (auto const& uri : dnd_data.Uris())
     {
       if (boost::algorithm::starts_with(uri, "file://"))
         return true;
@@ -1185,7 +1175,7 @@
 nux::DndAction ApplicationLauncherIcon::OnQueryAcceptDrop(DndData const& dnd_data)
 {
 #ifdef USE_X11
-  return ValidateUrisForLaunch(dnd_data).empty() ? nux::DNDACTION_NONE : nux::DNDACTION_COPY;
+  return dnd_data.Uris().empty() ? nux::DNDACTION_NONE : nux::DNDACTION_COPY;
 #else
   return nux::DNDACTION_NONE;
 #endif
@@ -1194,7 +1184,7 @@
 void ApplicationLauncherIcon::OnAcceptDrop(DndData const& dnd_data)
 {
   auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
-  OpenInstanceWithUris(ValidateUrisForLaunch(dnd_data), timestamp);
+  OpenInstanceWithUris(dnd_data.Uris(), timestamp);
 }
 
 bool ApplicationLauncherIcon::ShowInSwitcher(bool current)
 
=== modified file 'launcher/ApplicationLauncherIcon.h'
--- launcher/ApplicationLauncherIcon.h	2013-09-11 10:18:31 +0000
+++ launcher/ApplicationLauncherIcon.h	2013-10-07 22:37:56 +0000
@@ -93,7 +93,6 @@
   nux::DndAction OnQueryAcceptDrop(DndData const& dnd_data);
 
   MenuItemsVector GetMenus();
-  std::set<std::string> ValidateUrisForLaunch(DndData const& dnd_data);
 
   std::string GetRemoteUri() const;
 
 
=== modified file 'launcher/VolumeLauncherIcon.cpp'
--- launcher/VolumeLauncherIcon.cpp	2013-10-07 16:49:04 +0000
+++ launcher/VolumeLauncherIcon.cpp	2013-10-07 22:37:56 +0000
@@ -133,13 +133,13 @@
     volume_->StopDrive();
   }
 
-  void OpenInFileManager(uint64_t timestamp)
+  void DoActionWhenMounted(std::function<void()> const& callback)
   {
     if (!volume_->IsMounted())
     {
       auto conn = std::make_shared<sigc::connection>();
-      *conn = volume_->mounted.connect([this, conn, timestamp] {
-        file_manager_->OpenActiveChild(volume_->GetUri(), timestamp);
+      *conn = volume_->mounted.connect([this, conn, callback] {
+        callback();
         conn->disconnect();
       });
       connections_.Add(*conn);
@@ -147,8 +147,22 @@
     }
     else
     {
+      callback();
+    }
+  }
+
+  void OpenInFileManager(uint64_t timestamp)
+  {
+    DoActionWhenMounted([this, timestamp] {
       file_manager_->OpenActiveChild(volume_->GetUri(), timestamp);
-    }
+    });
+  }
+
+  void CopyFilesToVolume(std::set<std::string> const& files, uint64_t timestamp)
+  {
+    DoActionWhenMounted([this, files, timestamp] {
+      file_manager_->CopyFiles(files, volume_->GetUri(), timestamp);
+    });
   }
 
   MenuItemsVector GetMenus()
@@ -374,6 +388,28 @@
   SetQuirk(Quirk::VISIBLE, true);
 }
 
+bool VolumeLauncherIcon::OnShouldHighlightOnDrag(DndData const& dnd_data)
+{
+  for (auto const& uri : dnd_data.Uris())
+  {
+    if (uri.find("file://") == 0)
+      return true;
+  }
+
+  return false;
+}
+
+nux::DndAction VolumeLauncherIcon::OnQueryAcceptDrop(DndData const& dnd_data)
+{
+  return dnd_data.Uris().empty() ? nux::DNDACTION_NONE : nux::DNDACTION_COPY;
+}
+
+void VolumeLauncherIcon::OnAcceptDrop(DndData const& dnd_data)
+{
+  auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
+  pimpl_->CopyFilesToVolume(dnd_data.Uris(), timestamp);
+}
+
 //
 // Introspection
 //
 
=== modified file 'launcher/VolumeLauncherIcon.h'
--- launcher/VolumeLauncherIcon.h	2013-10-07 16:26:18 +0000
+++ launcher/VolumeLauncherIcon.h	2013-10-07 22:37:56 +0000
@@ -53,7 +53,10 @@
   std::string GetRemoteUri() const;
 
 protected:
-  virtual void ActivateLauncherIcon(ActionArg arg);
+  void ActivateLauncherIcon(ActionArg arg);
+  bool OnShouldHighlightOnDrag(DndData const&);
+  void OnAcceptDrop(DndData const&);
+  nux::DndAction OnQueryAcceptDrop(DndData const&);
 
   // Introspection
   virtual std::string GetName() const;
 
=== modified file 'tests/test_mock_filemanager.h'
--- tests/test_mock_filemanager.h	2013-10-07 16:26:18 +0000
+++ tests/test_mock_filemanager.h	2013-10-07 22:37:56 +0000
@@ -36,6 +36,7 @@
   MOCK_METHOD1(OpenTrash, void(uint64_t time));
   MOCK_METHOD1(TrashFile, bool(std::string const& uri));
   MOCK_METHOD1(EmptyTrash, void(uint64_t time));
+  MOCK_METHOD3(CopyFiles, void(std::set<std::string> const& files, std::string const& dest, uint64_t time));
   MOCK_CONST_METHOD0(OpenedLocations, std::vector<std::string>());
   MOCK_CONST_METHOD1(IsPrefixOpened, bool(std::string const& uri));
   MOCK_CONST_METHOD0(IsTrashOpened, bool());
 
=== modified file 'tests/test_volume_launcher_icon.cpp'
--- tests/test_volume_launcher_icon.cpp	2013-10-07 16:49:04 +0000
+++ tests/test_volume_launcher_icon.cpp	2013-10-07 22:37:56 +0000
@@ -42,10 +42,6 @@
   {
     SetupVolumeDefaultBehavior();
     SetupSettingsDefaultBehavior();
-  }
-
-  void CreateIcon()
-  {
     icon_ = new NiceMock<VolumeLauncherIcon>(volume_, settings_, notifications_, file_manager_);
   }
 
@@ -88,13 +84,25 @@
   std::string old_lang_;
 };
 
+struct TestVolumeLauncherIconDelayedConstruction : TestVolumeLauncherIcon
+{
+  TestVolumeLauncherIconDelayedConstruction()
+  {
+    icon_ = nullptr;
+  }
+
+  void CreateIcon()
+  {
+    icon_ = new NiceMock<VolumeLauncherIcon>(volume_, settings_, notifications_, file_manager_);
+  }
+};
+
 TEST_F(TestVolumeLauncherIcon, TestIconType)
 {
-  CreateIcon();
   EXPECT_EQ(icon_->GetIconType(), AbstractLauncherIcon::IconType::DEVICE);
 }
 
-TEST_F(TestVolumeLauncherIcon, TestRunningOnClosed)
+TEST_F(TestVolumeLauncherIconDelayedConstruction, TestRunningOnClosed)
 {
   ON_CALL(*file_manager_, IsPrefixOpened(volume_->GetUri())).WillByDefault(Return(false));
   CreateIcon();
@@ -102,7 +110,7 @@
   EXPECT_FALSE(icon_->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING));
 }
 
-TEST_F(TestVolumeLauncherIcon, TestRunningOnOpened)
+TEST_F(TestVolumeLauncherIconDelayedConstruction, TestRunningOnOpened)
 {
   ON_CALL(*file_manager_, IsPrefixOpened(volume_->GetUri())).WillByDefault(Return(true));
   CreateIcon();
@@ -112,7 +120,6 @@
 
 TEST_F(TestVolumeLauncherIcon, FilemanagerSignalDisconnection)
 {
-  CreateIcon();
   ASSERT_FALSE(file_manager_->locations_changed.empty());
   icon_ = nullptr;
   EXPECT_TRUE(file_manager_->locations_changed.empty());
@@ -120,8 +127,6 @@
 
 TEST_F(TestVolumeLauncherIcon, TestRunningStateOnLocationChangedClosed)
 {
-  CreateIcon();
-
   ON_CALL(*file_manager_, IsPrefixOpened(volume_->GetUri())).WillByDefault(Return(false));
   file_manager_->locations_changed.emit();
   EXPECT_FALSE(icon_->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING));
@@ -129,8 +134,6 @@
 
 TEST_F(TestVolumeLauncherIcon, TestRunningStateOnLocationChangedOpened)
 {
-  CreateIcon();
-
   ON_CALL(*file_manager_, IsPrefixOpened(volume_->GetUri())).WillByDefault(Return(true));
   file_manager_->locations_changed.emit();
   EXPECT_TRUE(icon_->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING));
@@ -138,39 +141,30 @@
 
 TEST_F(TestVolumeLauncherIcon, TestPosition)
 {
-  CreateIcon();
-
   EXPECT_EQ(icon_->position(), AbstractLauncherIcon::Position::FLOATING);
 }
 
 TEST_F(TestVolumeLauncherIcon, TestTooltipText)
 {
-  CreateIcon();
-
-  ASSERT_EQ(icon_->tooltip_text, "Test Name");
+  EXPECT_EQ(volume_->GetName(), icon_->tooltip_text());
 }
 
 TEST_F(TestVolumeLauncherIcon, TestIconName)
 {
-  CreateIcon();
-
-  ASSERT_EQ(icon_->icon_name, "Test Icon Name");
+  EXPECT_EQ(volume_->GetIconName(), icon_->icon_name());
 }
 
 TEST_F(TestVolumeLauncherIcon, TestVisibility_InitiallyMountedVolume)
 {
-  CreateIcon();
-
   EXPECT_TRUE(icon_->GetQuirk(AbstractLauncherIcon::Quirk::VISIBLE));
 }
 
 TEST_F(TestVolumeLauncherIcon, RemoteUri)
 {
-  CreateIcon();
   EXPECT_EQ(icon_->GetRemoteUri(), FavoriteStore::URI_PREFIX_DEVICE + volume_->GetIdentifier());
 }
 
-TEST_F(TestVolumeLauncherIcon, TestVisibility_InitiallyMountedBlacklistedVolume)
+TEST_F(TestVolumeLauncherIconDelayedConstruction, TestVisibility_InitiallyMountedBlacklistedVolume)
 {
   EXPECT_CALL(*settings_, IsABlacklistedDevice(_))
     .WillRepeatedly(Return(true));
@@ -181,7 +175,7 @@
 }
 
 
-TEST_F(TestVolumeLauncherIcon, TestVisibility_InitiallyUnmountedVolume)
+TEST_F(TestVolumeLauncherIconDelayedConstruction, TestVisibility_InitiallyUnmountedVolume)
 {
   EXPECT_CALL(*volume_, IsMounted())
     .WillRepeatedly(Return(false));
@@ -192,7 +186,7 @@
 }
 
 
-TEST_F(TestVolumeLauncherIcon, TestVisibility_InitiallyUnmountedBlacklistedVolume)
+TEST_F(TestVolumeLauncherIconDelayedConstruction, TestVisibility_InitiallyUnmountedBlacklistedVolume)
 {
   EXPECT_CALL(*volume_, IsMounted())
     .WillRepeatedly(Return(false));
@@ -207,8 +201,6 @@
 
 TEST_F(TestVolumeLauncherIcon, TestSettingsChangedSignal)
 {
-  CreateIcon();
-
   EXPECT_CALL(*settings_, IsABlacklistedDevice(_))
     .WillRepeatedly(Return(true));
   settings_->changed.emit();
@@ -218,8 +210,6 @@
 
 TEST_F(TestVolumeLauncherIcon, TestVisibilityAfterUnmount)
 {
-  CreateIcon();
-
   EXPECT_CALL(*volume_, IsMounted())
     .WillRepeatedly(Return(false));
 
@@ -231,7 +221,7 @@
   EXPECT_TRUE(icon_->GetQuirk(AbstractLauncherIcon::Quirk::VISIBLE));
 }
 
-TEST_F(TestVolumeLauncherIcon, TestVisibilityAfterUnmount_BlacklistedVolume)
+TEST_F(TestVolumeLauncherIconDelayedConstruction, TestVisibilityAfterUnmount_BlacklistedVolume)
 {
   EXPECT_CALL(*settings_, IsABlacklistedDevice(_))
     .WillRepeatedly(Return(true));
@@ -254,16 +244,12 @@
   EXPECT_CALL(*volume_, GetIdentifier())
     .WillRepeatedly(Return(""));
 
-  CreateIcon();
-
   for (auto menuitem : icon_->GetMenus())
     ASSERT_STRNE(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Unlock from Launcher");
 }
 
 TEST_F(TestVolumeLauncherIcon, TestUnlockFromLauncherMenuItem_Success)
 {
-  CreateIcon();
-
   auto menuitem = GetMenuItemAtIndex(4);
 
   ASSERT_STREQ(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Unlock from Launcher");
@@ -284,8 +270,6 @@
 
 TEST_F(TestVolumeLauncherIcon, TestUnlockFromLauncherMenuItem_Failure)
 {
-  CreateIcon();
-
   auto menuitem = GetMenuItemAtIndex(4);
 
   ASSERT_STREQ(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Unlock from Launcher");
@@ -302,8 +286,6 @@
 
 TEST_F(TestVolumeLauncherIcon, TestOpenMenuItem)
 {
-  CreateIcon();
-
   auto menuitem = GetMenuItemAtIndex(0);
 
   ASSERT_STREQ(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Open");
@@ -312,6 +294,8 @@
 
   ON_CALL(*volume_, IsMounted()).WillByDefault(Return(false));
   uint64_t time = g_random_int();
+
+  InSequence seq;
   EXPECT_CALL(*volume_, Mount());
   EXPECT_CALL(*file_manager_, OpenActiveChild(volume_->GetUri(), time));
 
@@ -320,8 +304,6 @@
 
 TEST_F(TestVolumeLauncherIcon, TestNameMenuItem)
 {
-  CreateIcon();
-
   auto menuitem = GetMenuItemAtIndex(2);
 
   EXPECT_EQ(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "<b>" + volume_->GetName() + "</b>");
@@ -331,6 +313,8 @@
 
   uint64_t time = g_random_int();
   ON_CALL(*volume_, IsMounted()).WillByDefault(Return(false));
+
+  InSequence seq;
   EXPECT_CALL(*volume_, Mount());
   EXPECT_CALL(*file_manager_, OpenActiveChild(volume_->GetUri(), time));
 
@@ -339,8 +323,6 @@
 
 TEST_F(TestVolumeLauncherIcon, TestEjectMenuItem_NotEjectableVolume)
 {
-  CreateIcon();
-
   for (auto menuitem : icon_->GetMenus())
     ASSERT_STRNE(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Eject");
 }
@@ -350,8 +332,6 @@
   EXPECT_CALL(*volume_, CanBeEjected())
     .WillRepeatedly(Return(true));
 
-  CreateIcon();
-
   auto menuitem = GetMenuItemAtIndex(5);
 
   EXPECT_CALL(*volume_, Eject());
@@ -366,8 +346,6 @@
 
 TEST_F(TestVolumeLauncherIcon, TestEjectMenuItem_NotStoppableVolume)
 {
-  CreateIcon();
-
   for (auto menuitem : icon_->GetMenus())
     ASSERT_STRNE(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Safely remove");
 }
@@ -377,8 +355,6 @@
   EXPECT_CALL(*volume_, CanBeStopped())
     .WillRepeatedly(Return(true));
 
-  CreateIcon();
-
   auto menuitem = GetMenuItemAtIndex(5);
 
   EXPECT_CALL(*volume_, StopDrive())
@@ -396,8 +372,6 @@
   EXPECT_CALL(*volume_, IsMounted())
     .WillRepeatedly(Return(false));
 
-  CreateIcon();
-
   for (auto menuitem : icon_->GetMenus())
     ASSERT_STRNE(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Unmount");
 }
@@ -408,11 +382,6 @@
   EXPECT_CALL(*volume_, CanBeEjected())
     .WillRepeatedly(Return(true));
 
-  EXPECT_CALL(*volume_, IsMounted())
-    .WillRepeatedly(Return(true));
-
-  CreateIcon();
-
   for (auto menuitem : icon_->GetMenus())
     ASSERT_STRNE(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Unmount");
 }
@@ -422,22 +391,12 @@
   EXPECT_CALL(*volume_, CanBeStopped())
     .WillRepeatedly(Return(true));
 
-  EXPECT_CALL(*volume_, IsMounted())
-    .WillRepeatedly(Return(true));
-
-  CreateIcon();
-
   for (auto menuitem : icon_->GetMenus())
     ASSERT_STRNE(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Unmount");
 }
 
 TEST_F(TestVolumeLauncherIcon, TestUnmountMenuItem)
 {
-  EXPECT_CALL(*volume_, IsMounted())
-    .WillRepeatedly(Return(true));
-
-  CreateIcon();
-
   auto menuitem = GetMenuItemAtIndex(5);
 
   EXPECT_CALL(*volume_, Unmount())
@@ -452,8 +411,6 @@
 
 TEST_F(TestVolumeLauncherIcon, TestCanBeEject)
 {
-  CreateIcon();
-
   EXPECT_CALL(*volume_, CanBeEjected())
     .WillRepeatedly(Return(true));
   ASSERT_TRUE(icon_->CanEject());
@@ -469,8 +426,6 @@
   EXPECT_CALL(*volume_, CanBeEjected())
     .WillRepeatedly(Return(true));
 
-  CreateIcon();
-
   EXPECT_CALL(*volume_, Eject());
   EXPECT_CALL(*notifications_, Display(volume_->GetIconName(), volume_->GetName()));
   icon_->EjectAndShowNotification();
@@ -478,8 +433,6 @@
 
 TEST_F(TestVolumeLauncherIcon, OnRemoved)
 {
-  CreateIcon();
-
   EXPECT_CALL(*settings_, TryToBlacklist(_))
     .Times(0);
   EXPECT_CALL(*settings_, TryToUnblacklist(_))
@@ -492,7 +445,6 @@
 {
   EXPECT_CALL(*volume_, CanBeRemoved())
     .WillRepeatedly(Return(true));
-  CreateIcon();
 
   EXPECT_CALL(*settings_, TryToBlacklist(_))
     .Times(0);
@@ -508,7 +460,6 @@
     .WillRepeatedly(Return(true));
   EXPECT_CALL(*settings_, IsABlacklistedDevice(_))
     .WillRepeatedly(Return(true));
-  CreateIcon();
 
   EXPECT_CALL(*settings_, TryToBlacklist(_))
     .Times(0);
@@ -520,8 +471,6 @@
 
 TEST_F(TestVolumeLauncherIcon, Stick)
 {
-  CreateIcon();
-
   bool saved = false;
   icon_->position_saved.connect([&saved] {saved = true;});
 
@@ -534,8 +483,6 @@
 
 TEST_F(TestVolumeLauncherIcon, StickAndSave)
 {
-  CreateIcon();
-
   bool saved = false;
   icon_->position_saved.connect([&saved] {saved = true;});
 
@@ -548,8 +495,6 @@
 
 TEST_F(TestVolumeLauncherIcon, Unstick)
 {
-  CreateIcon();
-
   bool forgot = false;
   icon_->position_forgot.connect([&forgot] {forgot = true;});
 
@@ -566,9 +511,8 @@
 
 TEST_F(TestVolumeLauncherIcon, ActivateMounted)
 {
-  CreateIcon();
-
   uint64_t time = g_random_int();
+  InSequence seq;
   EXPECT_CALL(*volume_, Mount()).Times(0);
   EXPECT_CALL(*file_manager_, OpenActiveChild(volume_->GetUri(), time));
   icon_->Activate(ActionArg(ActionArg::Source::LAUNCHER, 0, time));
@@ -576,13 +520,67 @@
 
 TEST_F(TestVolumeLauncherIcon, ActivateUnmounted)
 {
-  CreateIcon();
-
   uint64_t time = g_random_int();
   ON_CALL(*volume_, IsMounted()).WillByDefault(Return(false));
+  InSequence seq;
   EXPECT_CALL(*volume_, Mount());
   EXPECT_CALL(*file_manager_, OpenActiveChild(volume_->GetUri(), time));
   icon_->Activate(ActionArg(ActionArg::Source::LAUNCHER, 0, time));
 }
 
+TEST_F(TestVolumeLauncherIcon, ShouldHighlightOnDragFilesValid)
+{
+  DndData data;
+  std::string data_string = "file://file1\ndir2/file2\nfile://file3\nfile://dirN/fileN";
+  data.Fill(data_string.c_str());
+  EXPECT_TRUE(icon_->ShouldHighlightOnDrag(data));
+}
+
+TEST_F(TestVolumeLauncherIcon, ShouldHighlightOnDragFilesInvalid)
+{
+  DndData data;
+  std::string data_string = "file1\ndir2/file2\napplication://file3\nunity://lens";
+  data.Fill(data_string.c_str());
+  EXPECT_FALSE(icon_->ShouldHighlightOnDrag(data));
+}
+
+TEST_F(TestVolumeLauncherIcon, QueryAcceptDrop)
+{
+  DndData data;
+  EXPECT_EQ(nux::DNDACTION_NONE, icon_->QueryAcceptDrop(data));
+
+  std::string data_string = "file://foo/file";
+  data.Fill(data_string.c_str());
+  EXPECT_EQ(nux::DNDACTION_COPY, icon_->QueryAcceptDrop(data));
+}
+
+TEST_F(TestVolumeLauncherIcon, AcceptDropUnmounted)
+{
+  DndData data;
+  std::string data_string = "file://file1\ndir2/file2\nfile://file3\nfile://dirN/fileN";
+  data.Fill(data_string.c_str());
+  auto time = g_random_int();
+  nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp = time;
+
+  InSequence seq;
+  ON_CALL(*volume_, IsMounted()).WillByDefault(Return(false));
+  EXPECT_CALL(*volume_, Mount());
+  EXPECT_CALL(*file_manager_, CopyFiles(data.Uris(), volume_->GetUri(), time));
+  icon_->AcceptDrop(data);
+}
+
+TEST_F(TestVolumeLauncherIcon, AcceptDropMounted)
+{
+  DndData data;
+  std::string data_string = "file://file1\ndir2/file2\nfile://file3\nfile://dirN/fileN";
+  data.Fill(data_string.c_str());
+  auto time = g_random_int();
+  nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp = time;
+
+  InSequence seq;
+  EXPECT_CALL(*volume_, Mount()).Times(0);
+  EXPECT_CALL(*file_manager_, CopyFiles(data.Uris(), volume_->GetUri(), time));
+  icon_->AcceptDrop(data);
+}
+
 }
 
=== modified file 'unity-shared/FileManager.h'
--- unity-shared/FileManager.h	2013-09-05 16:22:56 +0000
+++ unity-shared/FileManager.h	2013-10-07 22:37:56 +0000
@@ -25,6 +25,7 @@
 #include <vector>
 #include <string>
 #include <vector>
+#include <set>
 #include <sigc++/sigc++.h>
 
 namespace unity
@@ -45,6 +46,7 @@
   virtual bool IsPrefixOpened(std::string const& uri) const = 0;
   virtual bool IsTrashOpened() const = 0;
   virtual bool IsDeviceOpened() const = 0;
+  virtual void CopyFiles(std::set<std::string> const& uris, std::string const& dest, uint64_t timestamp = 0) = 0;
   virtual bool TrashFile(std::string const& uri) = 0;
   virtual void EmptyTrash(uint64_t timestamp = 0) = 0;
 
 
=== modified file 'unity-shared/GnomeFileManager.cpp'
--- unity-shared/GnomeFileManager.cpp	2013-10-07 13:29:56 +0000
+++ unity-shared/GnomeFileManager.cpp	2013-10-07 22:37:56 +0000
@@ -220,6 +220,38 @@
   proxy->CallBegin("EmptyTrash", nullptr, [proxy] (GVariant*, glib::Error const&) {});
 }
 
+void GnomeFileManager::CopyFiles(std::set<std::string> const& uris, std::string const& dest, uint64_t timestamp)
+{
+  if (uris.empty() || dest.empty())
+    return;
+
+  bool found_valid = false;
+  GVariantBuilder b;
+  g_variant_builder_init(&b, G_VARIANT_TYPE("(ass)"));
+  g_variant_builder_open(&b, G_VARIANT_TYPE("as"));
+
+  for (auto const& uri : uris)
+  {
+    if (uri.find(FILE_SCHEMA) == 0)
+    {
+      found_valid = true;
+      g_variant_builder_add(&b, "s", uri.c_str());
+    }
+  }
+
+  g_variant_builder_close(&b);
+  g_variant_builder_add(&b, "s", dest.c_str());
+  glib::Variant parameters(g_variant_builder_end(&b));
+
+  if (found_valid)
+  {
+    // Passing the proxy to the lambda we ensure that it will be destroyed when needed
+    auto const& proxy = impl_->NautilusOperationsProxy();
+    proxy->CallBegin("CopyURIs", parameters, [proxy] (GVariant*, glib::Error const&) {});
+    Activate(timestamp);
+  }
+}
+
 std::vector<std::string> GnomeFileManager::OpenedLocations() const
 {
   return impl_->opened_locations_;
 
=== modified file 'unity-shared/GnomeFileManager.h'
--- unity-shared/GnomeFileManager.h	2013-09-05 16:22:56 +0000
+++ unity-shared/GnomeFileManager.h	2013-10-07 22:37:56 +0000
@@ -35,6 +35,8 @@
   void Open(std::string const& uri, uint64_t timestamp);
   void OpenActiveChild(std::string const& uri, uint64_t timestamp);
   void OpenTrash(uint64_t timestamp);
+
+  void CopyFiles(std::set<std::string> const& uris, std::string const& dest, uint64_t timestamp);
   bool TrashFile(std::string const& uri);
   void EmptyTrash(uint64_t timestamp);