Merge ~3v1n0/unity:use-upstream-nautilus-features into unity:master

[Marco Trevisan (Treviño)]

Use upstream features for GnomeFileManager, so we can now drop two nautilus patches:

19_unity_open_location_xid.patch
20_add_timestamp_to_operations.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e12a71a..e3abf80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ include (GNUInstallDirs)
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 7)
 set (UNITY_MINOR 5)
-set (UNITY_MICRO 0)
+set (UNITY_MICRO 1)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "6.0")
 set (UNITY_COMPONENTS_VERSION "6")
diff --git a/dash/ResultRendererTile.cpp b/dash/ResultRendererTile.cpp
index ae0fc22..94a26ff 100644
--- a/dash/ResultRendererTile.cpp
+++ b/dash/ResultRendererTile.cpp
@@ -259,7 +259,7 @@ nux::NBitmapData* ResultRendererTile::GetDndImage(Result const& row) const
   if (container && container->drag_icon && container->drag_icon.IsType(GDK_TYPE_PIXBUF))
   {
     // Need to ref the drag icon because GdkGraphics will unref it.
-    nux::GdkGraphics graphics(GDK_PIXBUF(g_object_ref(container->drag_icon)));
+    nux::GdkGraphics graphics(g_object_ref(static_cast<GdkPixbuf*>(container->drag_icon)));
     bitmap = graphics.GetBitmap();
   }
   return bitmap ? bitmap : ResultRenderer::GetDndImage(row);
diff --git a/debian/changelog b/debian/changelog
index ffea45d..a31fe6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,42 @@
+unity (7.5.1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * IntrospectionData: Keep Get() const as it should be.
+    The builder is now invalid but unreffing will happne in the destructor
+  * ResultRendererTile: Use proper casting to GdkPixbuf for drag icon
+  * CompizUtils: Add missing iostream include
+  * FileManager: Support timestamps and parent windows and implement for GNOME.
+    Finally implement org.gnome.Nautilus.FileOperations2 so we can get rid
+    of using our ubuntu patch in nautilus https://trello.com/c/ZVKL0Loz
+  * ApplicationManager: Add ability to get window properties.
+    A simple way to get properties through bamf, so that we don't have
+    to compute the atom ourselves.
+  * ApplicationManager: Add function to find a window by an (unique) property.
+    This is relevant for unique property values, otherwise we'd just return
+    the firs window matching it.
+  * GnomeFileManager: Use upstream OpenWindowsWithLocations.
+    Find nautilus application windows by their unique GTK window object path
+    using the application manager, in this way we can drop the support to
+    the ubuntu-only XUbuntuOpenLocationsXids property.
+    As per this, recommends an higher version of nautilus.
+  * VolumeLauncherIcons: Hide shadowed mounts
+  * TestSoftwareCenterLauncherIcon: Expose proper virtual function.
+    Compiler seems to be confused by using a base class implementation,
+    so let's just point to the class one and leave it figure out which
+    implementation to use at runtime.
+  * TestGtkIconInfo: Ignore icons that gtk can't find.
+    We still ensure that we've tested various, so the test is still valid
+  * TestResultRenderer: Use a freedesktop icon for the test.
+    So we can be sure that a theme will provide it
+  * tests/dummy-xorg-test-runner.sh: Do not delete log files on failure
+  * LauncherController: Move GetLastIconPriority into a private impl header.
+    Being a template it must be defined for all its customers, so expose it
+    to the test.
+    Fixes linking issue on s390x.
+  * tests/test_text_input: Initialize previews style
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 01 Jun 2021 21:56:27 +0200
+
 unity (7.5.0+20.04.20200312-0ubuntu1) focal; urgency=medium
 
   [ Khurshid Alam ]
diff --git a/debian/control b/debian/control
index 945f092..cd3a3bf 100644
--- a/debian/control
+++ b/debian/control
@@ -90,7 +90,7 @@ Depends: ${shlibs:Depends},
 	 unity-scope-home,
 Recommends: unity-control-center,
             ${unity-default-masterscopes}
-            nautilus,
+            nautilus (>> 3.37.1),
             nemo,
             gnome-disk-utility,
             hud,
diff --git a/launcher/LauncherController.cpp b/launcher/LauncherController.cpp
index 5fb2882..3a38b5f 100644
--- a/launcher/LauncherController.cpp
+++ b/launcher/LauncherController.cpp
@@ -36,6 +36,7 @@
 #include "FileManagerLauncherIcon.h"
 #include "LauncherController.h"
 #include "LauncherControllerPrivate.h"
+#include "LauncherControllerPrivateImpl.h"
 #include "SoftwareCenterLauncherIcon.h"
 #include "ExpoLauncherIcon.h"
 #include "TrashLauncherIcon.h"
@@ -790,59 +791,6 @@ void Controller::Impl::RegisterIcon(AbstractLauncherIcon::Ptr const& icon, int p
   }
 }
 
-template<typename IconType>
-int Controller::Impl::GetLastIconPriority(std::string const& favorite_uri, bool sticky)
-{
-  auto const& icons = model_->GetSublist<IconType>();
-  int icon_prio = std::numeric_limits<int>::min();
-
-  AbstractLauncherIcon::Ptr last_icon;
-
-  // Get the last (non)-sticky icon position (if available)
-  for (auto it = icons.rbegin(); it != icons.rend(); ++it)
-  {
-    auto const& icon = *it;
-    bool update_last_icon = ((!last_icon && !sticky) || sticky);
-
-    if (update_last_icon || icon->IsSticky() == sticky)
-    {
-      last_icon = icon;
-
-      if (icon->IsSticky() == sticky)
-        break;
-    }
-  }
-
-  if (last_icon)
-  {
-    icon_prio = last_icon->SortPriority();
-
-    if (sticky && last_icon->IsSticky() != sticky)
-      icon_prio -= 1;
-  }
-  else if (!favorite_uri.empty())
-  {
-    // If we have no applications opened, we must guess it position by favorites
-    for (auto const& fav : FavoriteStore::Instance().GetFavorites())
-    {
-      if (fav == favorite_uri)
-      {
-        if (icon_prio == std::numeric_limits<int>::min())
-          icon_prio = (*model_->begin())->SortPriority() - 1;
-
-        break;
-      }
-
-      auto const& icon = GetIconByUri(fav);
-
-      if (icon)
-        icon_prio = icon->SortPriority();
-    }
-  }
-
-  return icon_prio;
-}
-
 void Controller::Impl::OnApplicationStarted(ApplicationPtr const& app)
 {
   if (app->sticky() || app->seen())
diff --git a/launcher/LauncherControllerPrivateImpl.h b/launcher/LauncherControllerPrivateImpl.h
new file mode 100644
index 0000000..88b1db8
--- /dev/null
+++ b/launcher/LauncherControllerPrivateImpl.h
@@ -0,0 +1,81 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2010-2012 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Jason Smith <[e-mail]>
+ *              Tim Penhey <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
+ */
+
+namespace unity
+{
+namespace launcher
+{
+
+template<typename IconType>
+int Controller::Impl::GetLastIconPriority(std::string const& favorite_uri, bool sticky)
+{
+  auto const& icons = model_->GetSublist<IconType>();
+  int icon_prio = std::numeric_limits<int>::min();
+
+  AbstractLauncherIcon::Ptr last_icon;
+
+  // Get the last (non)-sticky icon position (if available)
+  for (auto it = icons.rbegin(); it != icons.rend(); ++it)
+  {
+    auto const& icon = *it;
+    bool update_last_icon = ((!last_icon && !sticky) || sticky);
+
+    if (update_last_icon || icon->IsSticky() == sticky)
+    {
+      last_icon = icon;
+
+      if (icon->IsSticky() == sticky)
+        break;
+    }
+  }
+
+  if (last_icon)
+  {
+    icon_prio = last_icon->SortPriority();
+
+    if (sticky && last_icon->IsSticky() != sticky)
+      icon_prio -= 1;
+  }
+  else if (!favorite_uri.empty())
+  {
+    // If we have no applications opened, we must guess it position by favorites
+    for (auto const& fav : FavoriteStore::Instance().GetFavorites())
+    {
+      if (fav == favorite_uri)
+      {
+        if (icon_prio == std::numeric_limits<int>::min())
+          icon_prio = (*model_->begin())->SortPriority() - 1;
+
+        break;
+      }
+
+      auto const& icon = GetIconByUri(fav);
+
+      if (icon)
+        icon_prio = icon->SortPriority();
+    }
+  }
+
+  return icon_prio;
+}
+
+} // namespace launcher
+} // namespace unity
diff --git a/launcher/MockLauncherIcon.h b/launcher/MockLauncherIcon.h
index 550047d..1ceb65c 100644
--- a/launcher/MockLauncherIcon.h
+++ b/launcher/MockLauncherIcon.h
@@ -55,6 +55,7 @@ public:
   virtual WindowType type() const { return WindowType::UNKNOWN; }
 
   virtual Window window_id() const { return xid_; }
+  virtual std::string property(std::string const& name) const { return name; }
   virtual int monitor() const { return -1; }
   virtual ApplicationPtr application() const { return ApplicationPtr(); }
   virtual bool Focus() const { return false; }
diff --git a/launcher/Volume.h b/launcher/Volume.h
index b6c03ff..a40aae0 100644
--- a/launcher/Volume.h
+++ b/launcher/Volume.h
@@ -49,6 +49,7 @@ public:
   virtual std::string GetUri() const = 0;
   virtual bool HasSiblings() const = 0;
   virtual bool IsMounted() const = 0;
+  virtual bool IsShadowed() const = 0;
 
   virtual void Eject() = 0;
   virtual void Mount() = 0;
diff --git a/launcher/VolumeImp.cpp b/launcher/VolumeImp.cpp
index 7e9957e..e2f272d 100644
--- a/launcher/VolumeImp.cpp
+++ b/launcher/VolumeImp.cpp
@@ -120,6 +120,12 @@ public:
     return static_cast<bool>(mount);
   }
 
+  bool IsShadowed() const
+  {
+    glib::Object<GMount> mount(g_volume_get_mount(volume_));
+    return mount ? g_mount_is_shadowed(mount) : false;
+  }
+
   void Eject()
   {
     if (!CanBeEjected())
@@ -264,6 +270,11 @@ bool VolumeImp::IsMounted() const
   return pimpl->IsMounted();
 }
 
+bool VolumeImp::IsShadowed() const
+{
+  return pimpl->IsShadowed();
+}
+
 void VolumeImp::Mount()
 {
   pimpl->Mount();
diff --git a/launcher/VolumeImp.h b/launcher/VolumeImp.h
index 47a9b0b..363f7dd 100644
--- a/launcher/VolumeImp.h
+++ b/launcher/VolumeImp.h
@@ -51,6 +51,7 @@ public:
   virtual std::string GetUri() const;
   virtual bool HasSiblings() const;
   virtual bool IsMounted() const;
+  virtual bool IsShadowed() const;
 
   virtual void Eject();
   virtual void Mount();
diff --git a/launcher/VolumeLauncherIcon.cpp b/launcher/VolumeLauncherIcon.cpp
index 6cbbc5c..d8d0a0f 100644
--- a/launcher/VolumeLauncherIcon.cpp
+++ b/launcher/VolumeLauncherIcon.cpp
@@ -78,6 +78,9 @@ public:
     if (IsBlackListed() && parent_->GetManagedWindows().empty())
       return false;
 
+    if (volume_->IsShadowed())
+      return false;
+
     return true;
   }
 
diff --git a/tests/dummy-xorg-test-runner.sh b/tests/dummy-xorg-test-runner.sh
index 93e5ac6..a4808f8 100755
--- a/tests/dummy-xorg-test-runner.sh
+++ b/tests/dummy-xorg-test-runner.sh
@@ -54,7 +54,10 @@ function do_cleanup()
 {
   if [ -n "$x_pid" ] && (kill -0 $x_pid &> /dev/null); then kill $x_pid; fi
   rm $conffile
-  rm $logfile*
+
+  if [[ "$ret_val" == 0 ]]; then
+    rm $logfile*
+  fi
 }
 
 trap "do_cleanup; exit 1" SIGHUP SIGINT SIGSEGV SIGTERM
diff --git a/tests/mock-application.h b/tests/mock-application.h
index 0ee200f..bd00908 100644
--- a/tests/mock-application.h
+++ b/tests/mock-application.h
@@ -55,6 +55,7 @@ struct MockApplicationWindow : unity::ApplicationWindow
 
     ON_CALL(*this, type()).WillByDefault(Invoke([this] { return type_; }));
     ON_CALL(*this, window_id()).WillByDefault(Invoke([this] { return xid_; }));
+    ON_CALL(*this, property(_)).WillByDefault(Return("MockWindowProperty"));
     ON_CALL(*this, Focus()).WillByDefault(Invoke([this] { return LocalFocus(); }));
     ON_CALL(*this, application()).WillByDefault(Return(unity::ApplicationPtr()));
   }
@@ -71,6 +72,7 @@ struct MockApplicationWindow : unity::ApplicationWindow
 
   MOCK_CONST_METHOD0(type, unity::WindowType());
   MOCK_CONST_METHOD0(window_id, Window());
+  MOCK_CONST_METHOD1(property, std::string(std::string const&));
   MOCK_CONST_METHOD0(application, unity::ApplicationPtr());
   MOCK_CONST_METHOD0(Focus, bool());
   MOCK_CONST_METHOD0(Quit, void());
@@ -319,6 +321,9 @@ struct MockApplicationManager : public unity::ApplicationManager
     ON_CALL(*this, GetActiveApplication()).WillByDefault(Invoke([this] { return unity::ApplicationPtr(); } ));
     ON_CALL(*this, GetWindowsForMonitor(_)).WillByDefault(Invoke([this] (Window) { return unity::WindowList(); } ));
     ON_CALL(*this, GetWindowForId(_)).WillByDefault(Invoke([this] (int) { return unity::ApplicationWindowPtr(); } ));
+    ON_CALL(*this, GetWindowForProperty(_, _)).WillByDefault(Invoke([this] (std::string const&, std::string const&) {
+      return unity::ApplicationWindowPtr();
+    }));
   }
 
   static void StartApp(std::string const& desktop_file)
@@ -338,6 +343,7 @@ struct MockApplicationManager : public unity::ApplicationManager
   MOCK_CONST_METHOD0(GetActiveApplication, unity::ApplicationPtr());
   MOCK_CONST_METHOD1(GetWindowsForMonitor, unity::WindowList(int));
   MOCK_CONST_METHOD1(GetWindowForId, unity::ApplicationWindowPtr(Window));
+  MOCK_CONST_METHOD2(GetWindowForProperty, unity::ApplicationWindowPtr(std::string const&, std::string const&));
   MOCK_CONST_METHOD3(FocusWindowGroup, void(unity::WindowList const&, bool, int));
 
   unity::ApplicationPtr LocalGetApplicationForDesktopFile(std::string const& desktop_file)
diff --git a/tests/test_gtk_icon_info.cpp b/tests/test_gtk_icon_info.cpp
index bc4d8fb..6aaefd9 100644
--- a/tests/test_gtk_icon_info.cpp
+++ b/tests/test_gtk_icon_info.cpp
@@ -38,17 +38,27 @@ TEST(TestGtkIconInfo, EmptyIconInfo)
 TEST(TestGtkIconInfo, ValidIconInfo)
 {
   GList *icons = gtk_icon_theme_list_icons(gtk_icon_theme_get_default(), "Emblems");
+  bool found_any = false;
 
   for (GList *l = icons; l; l = l->next)
   {
     auto icon_name = static_cast <const char*>(l->data);
     GtkIconInfo *ginfo = gtk_icon_theme_lookup_icon(gtk_icon_theme_get_default(), icon_name, 32, GTK_ICON_LOOKUP_FORCE_SIZE);
     glib::Object<GtkIconInfo> info(ginfo);
+    if (!ginfo)
+    {
+      ASSERT_THAT(info.RawPtr(), IsNull());
+      continue;
+    }
+
+    found_any = true;
     ASSERT_THAT(info.RawPtr(), NotNull());
     ASSERT_TRUE(info);
     ASSERT_EQ(info, ginfo);
   }
 
+  ASSERT_TRUE(found_any);
+
   g_list_free_full(icons, g_free);
 }
 
diff --git a/tests/test_launcher_controller.cpp b/tests/test_launcher_controller.cpp
index 6a6df5c..9495dff 100644
--- a/tests/test_launcher_controller.cpp
+++ b/tests/test_launcher_controller.cpp
@@ -22,6 +22,7 @@
 #include "FavoriteStore.h"
 #include "LauncherController.h"
 #include "LauncherControllerPrivate.h"
+#include "LauncherControllerPrivateImpl.h"
 #include "ExpoLauncherIcon.h"
 #include "DesktopLauncherIcon.h"
 #include "DesktopUtilities.h"
diff --git a/tests/test_mock_devices.h b/tests/test_mock_devices.h
index 7dc0fce..d389ba1 100644
--- a/tests/test_mock_devices.h
+++ b/tests/test_mock_devices.h
@@ -89,6 +89,7 @@ struct MockVolume : Volume
   MOCK_CONST_METHOD0(HasSiblings, bool(void));
   MOCK_CONST_METHOD0(CanBeEjected, bool(void));
   MOCK_CONST_METHOD0(IsMounted, bool(void));
+  MOCK_CONST_METHOD0(IsShadowed, bool(void));
 
   MOCK_METHOD0(Eject, void());
   MOCK_METHOD0(Mount, void());
diff --git a/tests/test_mock_filemanager.h b/tests/test_mock_filemanager.h
index 1e541eb..8eb7925 100644
--- a/tests/test_mock_filemanager.h
+++ b/tests/test_mock_filemanager.h
@@ -34,8 +34,10 @@ struct MockFileManager : FileManager
   MOCK_METHOD2(Open, void(std::string const& uri, uint64_t time));
   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_METHOD2(EmptyTrash, void(uint64_t time, Window parent_xid));
+  MOCK_METHOD4(CopyFiles, void(std::set<std::string> const& files,
+                              std::string const& dest, uint64_t time,
+                              Window parent_xid));
   MOCK_CONST_METHOD1(WindowsForLocation, WindowList(std::string const&));
   MOCK_CONST_METHOD1(LocationForWindow, std::string(ApplicationWindowPtr const&));
 
diff --git a/tests/test_result_renderer.cpp b/tests/test_result_renderer.cpp
index 9a0b2b0..2f286be 100644
--- a/tests/test_result_renderer.cpp
+++ b/tests/test_result_renderer.cpp
@@ -39,7 +39,7 @@ namespace unity
 namespace
 {
 
-#define DEFAULT_GICON ". GThemedIcon cmake"
+#define DEFAULT_GICON ". GThemedIcon terminal"
 
 } // namespace [anonymous]
 
diff --git a/tests/test_software_center_launcher_icon.cpp b/tests/test_software_center_launcher_icon.cpp
index 98ef81d..4984cca 100644
--- a/tests/test_software_center_launcher_icon.cpp
+++ b/tests/test_software_center_launcher_icon.cpp
@@ -69,7 +69,7 @@ struct TestSoftwareCenterLauncherIcon : testmocks::TestUnityAppBase
     using SoftwareCenterLauncherIcon::GetActualDesktopFileAfterInstall;
     using SoftwareCenterLauncherIcon::OnFinished;
     using SoftwareCenterLauncherIcon::OnPropertyChanged;
-    using LauncherIcon::GetRemoteUri;
+    using SoftwareCenterLauncherIcon::GetRemoteUri;
   };
 
   nux::ObjectPtr<Launcher> CreateLauncher()
diff --git a/tests/test_text_input.cpp b/tests/test_text_input.cpp
index e37352d..4d3b418 100644
--- a/tests/test_text_input.cpp
+++ b/tests/test_text_input.cpp
@@ -23,6 +23,7 @@
 #include <gtest/gtest.h>
 
 #include "unity-shared/DashStyle.h"
+#include "unity-shared/PreviewStyle.h"
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/TextInput.h"
 #include "test_utils.h"
@@ -55,6 +56,7 @@ class TestTextInput : public ::testing::Test
        pango_entry = entry->GetPangoEntry();
      }
 
+     dash::previews::Style previews_style_;
      dash::Style dash_style_;
      nux::ObjectPtr<TextInputMock> entry;
      StaticCairoText* hint;
diff --git a/tests/test_trash_launcher_icon.cpp b/tests/test_trash_launcher_icon.cpp
index 58690c5..f224b0d 100644
--- a/tests/test_trash_launcher_icon.cpp
+++ b/tests/test_trash_launcher_icon.cpp
@@ -76,7 +76,7 @@ TEST_F(TestTrashLauncherIcon, QuicklistEmptyTrash)
   auto const& empty_trash_menu = menus.front();
 
   unsigned time = g_random_int();
-  EXPECT_CALL(*fm_, EmptyTrash(time));
+  EXPECT_CALL(*fm_, EmptyTrash(time, 0));
   dbusmenu_menuitem_handle_event(empty_trash_menu, DBUSMENU_MENUITEM_EVENT_ACTIVATED, nullptr, time);
 }
 
diff --git a/tests/test_volume_launcher_icon.cpp b/tests/test_volume_launcher_icon.cpp
index cee0dc9..569cb3c 100644
--- a/tests/test_volume_launcher_icon.cpp
+++ b/tests/test_volume_launcher_icon.cpp
@@ -711,7 +711,7 @@ TEST_F(TestVolumeLauncherIcon, AcceptDropUnmounted)
   InSequence seq;
   ON_CALL(*volume_, IsMounted()).WillByDefault(Return(false));
   EXPECT_CALL(*volume_, Mount());
-  EXPECT_CALL(*file_manager_, CopyFiles(data.Uris(), volume_->GetUri(), time));
+  EXPECT_CALL(*file_manager_, CopyFiles(data.Uris(), volume_->GetUri(), time, 0));
   icon_->AcceptDrop(data);
 }
 
@@ -725,7 +725,7 @@ TEST_F(TestVolumeLauncherIcon, AcceptDropMounted)
 
   InSequence seq;
   EXPECT_CALL(*volume_, Mount()).Times(0);
-  EXPECT_CALL(*file_manager_, CopyFiles(data.Uris(), volume_->GetUri(), time));
+  EXPECT_CALL(*file_manager_, CopyFiles(data.Uris(), volume_->GetUri(), time, 0));
   icon_->AcceptDrop(data);
 }
 
diff --git a/unity-shared/ApplicationManager.h b/unity-shared/ApplicationManager.h
index 04f6e59..e60a56f 100644
--- a/unity-shared/ApplicationManager.h
+++ b/unity-shared/ApplicationManager.h
@@ -102,6 +102,8 @@ public:
     return !(operator==(other));
   }
 
+  virtual std::string property(std::string const& name) const = 0;
+
   nux::ROProperty<int> monitor;
 
   nux::ROProperty<std::string> title;
@@ -225,6 +227,7 @@ public:
   virtual WindowList GetWindowsForMonitor(int monitor = -1) const = 0;
   virtual ApplicationPtr GetApplicationForWindow(Window xid) const = 0;
   virtual ApplicationWindowPtr GetWindowForId(Window xid) const = 0;
+  virtual ApplicationWindowPtr GetWindowForProperty(const std::string& name, const std::string& value) const = 0;
   virtual void FocusWindowGroup(WindowList const&, bool show_on_visible, int monitor) const = 0;
 
   sigc::signal<void, ApplicationPtr const&> application_started;
diff --git a/unity-shared/BamfApplicationManager.cpp b/unity-shared/BamfApplicationManager.cpp
index b9f56d0..fb580ef 100644
--- a/unity-shared/BamfApplicationManager.cpp
+++ b/unity-shared/BamfApplicationManager.cpp
@@ -209,6 +209,11 @@ Window AppWindow::window_id() const
   return bamf_window_get_xid(bamf_window_);
 }
 
+std::string AppWindow::property(std::string const& property) const
+{
+  return glib::String(bamf_window_get_utf8_prop(bamf_window_, property.c_str())).Str();
+}
+
 WindowType AppWindow::type() const
 {
   switch (bamf_window_get_window_type(bamf_window_))
@@ -725,6 +730,26 @@ ApplicationWindowPtr Manager::GetWindowForId(Window xid) const
   return nullptr;
 }
 
+ApplicationWindowPtr Manager::GetWindowForProperty(std::string const& name, std::string const& value) const
+{
+  if (name.empty())
+    return nullptr;
+
+  for (auto const& win_pair : pool::wins_)
+  {
+    if (win_pair.second->property(name) == value)
+      return win_pair.second;
+  }
+
+  for (auto const& win : GetWindowsForMonitor())
+  {
+    if (win->property(name) == value)
+      return win;
+  }
+
+  return nullptr;
+}
+
 ApplicationList Manager::GetRunningApplications() const
 {
   ApplicationList result;
diff --git a/unity-shared/BamfApplicationManager.h b/unity-shared/BamfApplicationManager.h
index 214b383..eac6d25 100644
--- a/unity-shared/BamfApplicationManager.h
+++ b/unity-shared/BamfApplicationManager.h
@@ -81,6 +81,7 @@ public:
 
   WindowType type() const override;
   Window window_id() const override;
+  std::string property(std::string const& name) const override;
   ApplicationPtr application() const override;
   void Quit() const override;
 
@@ -172,6 +173,7 @@ public:
   WindowList GetWindowsForMonitor(int monitor = -1) const override;
   ApplicationPtr GetApplicationForWindow(Window xid) const override;
   ApplicationWindowPtr GetWindowForId(Window xid) const override;
+  ApplicationWindowPtr GetWindowForProperty(const std::string& name, const std::string& value) const override;
 
   ApplicationPtr EnsureApplication(BamfView*) const;
   ApplicationWindowPtr EnsureWindow(BamfView*) const;
diff --git a/unity-shared/CompizUtils.cpp b/unity-shared/CompizUtils.cpp
index 643dfd1..bbc9ae9 100644
--- a/unity-shared/CompizUtils.cpp
+++ b/unity-shared/CompizUtils.cpp
@@ -21,6 +21,7 @@
 #include <cairo-xlib.h>
 #include <cairo-xlib-xrender.h>
 #include <core/screen.h>
+#include <iostream>
 
 namespace unity
 {
diff --git a/unity-shared/FileManager.h b/unity-shared/FileManager.h
index 15dc1d9..d3f7c46 100644
--- a/unity-shared/FileManager.h
+++ b/unity-shared/FileManager.h
@@ -43,9 +43,10 @@ public:
 
   virtual void Open(std::string const& uri, uint64_t timestamp = 0) = 0;
   virtual void OpenTrash(uint64_t timestamp) = 0;
-  virtual void CopyFiles(std::set<std::string> const& uris, std::string const& dest, uint64_t timestamp = 0) = 0;
+  virtual void CopyFiles(std::set<std::string> const& uris, std::string const& dest,
+                         uint64_t timestamp = 0, Window parent_xid = 0) = 0;
   virtual bool TrashFile(std::string const& uri) = 0;
-  virtual void EmptyTrash(uint64_t timestamp = 0) = 0;
+  virtual void EmptyTrash(uint64_t timestamp = 0, Window parent_xid = 0) = 0;
   virtual WindowList WindowsForLocation(std::string const& location) const = 0;
   virtual std::string LocationForWindow(ApplicationWindowPtr const&) const = 0;
 
diff --git a/unity-shared/GnomeFileManager.cpp b/unity-shared/GnomeFileManager.cpp
index df35347..bd2a051 100644
--- a/unity-shared/GnomeFileManager.cpp
+++ b/unity-shared/GnomeFileManager.cpp
@@ -38,7 +38,9 @@ const std::string TRASH_URI = "trash:///";
 const std::string FILE_SCHEMA = "file://";
 
 const std::string NAUTILUS_NAME = "org.gnome.Nautilus";
-const std::string NAUTILUS_PATH = "/org/gnome/Nautilus";
+const std::string NAUTILUS_FILE_OPS_PATH = "/org/gnome/Nautilus/FileOperations2";
+
+const std::string GTK_WINDOW_PATH_PROPERTY = "_GTK_WINDOW_OBJECT_PATH";
 }
 
 struct GnomeFileManager::Impl
@@ -47,22 +49,22 @@ struct GnomeFileManager::Impl
     : parent_(parent)
     , filemanager_proxy_("org.freedesktop.FileManager1", "/org/freedesktop/FileManager1", "org.freedesktop.FileManager1", G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS)
   {
-    auto callback = sigc::mem_fun(this, &Impl::OnOpenLocationsXidsUpdated);
-    filemanager_proxy_.GetProperty("XUbuntuOpenLocationsXids", callback);
-    filemanager_proxy_.ConnectProperty("XUbuntuOpenLocationsXids", callback);
+    auto callback = sigc::mem_fun(this, &Impl::OnOpenWindowsWithLocationsChanged);
+    filemanager_proxy_.GetProperty("OpenWindowsWithLocations", callback);
+    filemanager_proxy_.ConnectProperty("OpenWindowsWithLocations", callback);
   }
 
   glib::DBusProxy::Ptr NautilusOperationsProxy() const
   {
     auto flags = static_cast<GDBusProxyFlags>(G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES|G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS);
-    return std::make_shared<glib::DBusProxy>(NAUTILUS_NAME, NAUTILUS_PATH,
-                                             "org.gnome.Nautilus.FileOperations",
+    return std::make_shared<glib::DBusProxy>(NAUTILUS_NAME, NAUTILUS_FILE_OPS_PATH,
+                                             "org.gnome.Nautilus.FileOperations2",
                                              G_BUS_TYPE_SESSION, flags);
   }
 
-  void OnOpenLocationsXidsUpdated(GVariant* value)
+  void OnOpenWindowsWithLocationsChanged(GVariant* value)
   {
-    opened_location_for_xid_.clear();
+    opened_location_for_window_.clear();
 
     if (!value)
     {
@@ -71,7 +73,7 @@ struct GnomeFileManager::Impl
       return;
     }
 
-    if (!g_variant_is_of_type(value, G_VARIANT_TYPE("a{uas}")))
+    if (!g_variant_is_of_type(value, G_VARIANT_TYPE("a{sas}")))
     {
       LOG_ERROR(logger) << "Locations value type is not matching the expected one!";
       parent_->locations_changed.emit();
@@ -81,39 +83,46 @@ struct GnomeFileManager::Impl
     GVariantIter iter;
     GVariantIter *str_iter;
     const char *loc;
-    guint32 xid;
+    const char *window_path;
+    std::map<std::string, std::string> opened_locations_for_path;
 
     g_variant_iter_init(&iter, value);
 
-    while (g_variant_iter_loop(&iter, "{uas}", &xid, &str_iter))
+    while (g_variant_iter_loop(&iter, "{&sas}", &window_path, &str_iter))
     {
       while (g_variant_iter_loop(str_iter, "s", &loc))
       {
         /* We only care about the first mentioned location as per our "standard"
          * it's the active one */
-        LOG_DEBUG(logger) << xid << ": Opened location " << loc;
-        opened_location_for_xid_[xid] = loc;
+        LOG_DEBUG(logger) << window_path << ": Opened location " << loc;
+        opened_locations_for_path[window_path] = loc;
         break;
       }
     }
 
     // We must ensure that we emit the locations_changed signal only when all
     // the parent windows have been registered on the app-manager
-    auto app_manager_not_synced = [this]
+    auto app_manager_not_synced = [this, opened_locations_for_path]
     {
       auto& app_manager = ApplicationManager::Default();
       bool synced = true;
 
-      for (auto const& pair : opened_location_for_xid_)
+      for (auto const& pair : opened_locations_for_path)
       {
-        synced = (app_manager.GetWindowForId(pair.first) != nullptr);
+        auto win = app_manager.GetWindowForProperty(GTK_WINDOW_PATH_PROPERTY, pair.first);
+        synced = (win != nullptr);
 
         if (!synced)
           break;
+
+        LOG_DEBUG(logger) << win->window_id() << ": Opened location " << pair.second;
+        opened_location_for_window_[win] = pair.second;
       }
 
       if (synced)
         parent_->locations_changed.emit();
+      else
+        opened_location_for_window_.clear();
 
       return !synced;
     };
@@ -122,10 +131,31 @@ struct GnomeFileManager::Impl
       idle_.reset(new glib::Idle(app_manager_not_synced));
   }
 
+  GVariant *GetPlatformData(uint64_t timestamp, Window parent_xid)
+  {
+    GVariantBuilder builder;
+    char *parent_handle;
+
+    g_variant_builder_init(&builder, G_VARIANT_TYPE ("a{sv}"));
+
+    parent_handle = g_strdup_printf("x11:%lx", parent_xid);
+
+    g_variant_builder_add(&builder, "{sv}", "parent-handle",
+                          g_variant_new_take_string(parent_handle));
+
+    g_variant_builder_add(&builder, "{sv}", "timestamp",
+                          g_variant_new_uint32(timestamp));
+
+    g_variant_builder_add(&builder, "{sv}", "window-position",
+                          g_variant_new_string("center"));
+
+    return g_variant_builder_end(&builder);
+  }
+
   GnomeFileManager* parent_;
   glib::DBusProxy filemanager_proxy_;
   glib::Source::UniquePtr idle_;
-  std::map<Window, std::string> opened_location_for_xid_;
+  std::map<ApplicationWindowPtr, std::string> opened_location_for_window_;
 };
 
 
@@ -184,22 +214,29 @@ bool GnomeFileManager::TrashFile(std::string const& uri)
   return false;
 }
 
-void GnomeFileManager::EmptyTrash(uint64_t timestamp)
+void GnomeFileManager::EmptyTrash(uint64_t timestamp, Window parent_xid)
 {
   auto const& proxy = impl_->NautilusOperationsProxy();
+  const bool ask_confirmation = true;
+
+  GVariantBuilder b;
+  g_variant_builder_init(&b, G_VARIANT_TYPE("(ba{sv})"));
+  g_variant_builder_add(&b, "b", ask_confirmation);
+  g_variant_builder_add_value(&b, impl_->GetPlatformData(timestamp, parent_xid));
+  glib::Variant parameters(g_variant_builder_end(&b));
 
   // Passing the proxy to the lambda we ensure that it will be destroyed when needed
-  proxy->CallBegin("EmptyTrashWithTimestamp", g_variant_new("(u)", timestamp), [proxy] (GVariant*, glib::Error const&) {});
+  proxy->CallBegin("EmptyTrash", parameters, [proxy] (GVariant*, glib::Error const&) {});
 }
 
-void GnomeFileManager::CopyFiles(std::set<std::string> const& uris, std::string const& dest, uint64_t timestamp)
+void GnomeFileManager::CopyFiles(std::set<std::string> const& uris, std::string const& dest, uint64_t timestamp, Window parent_xid)
 {
   if (uris.empty() || dest.empty())
     return;
 
   bool found_valid = false;
   GVariantBuilder b;
-  g_variant_builder_init(&b, G_VARIANT_TYPE("(assu)"));
+  g_variant_builder_init(&b, G_VARIANT_TYPE("(assa{sv})"));
   g_variant_builder_open(&b, G_VARIANT_TYPE("as"));
 
   for (auto const& uri : uris)
@@ -213,25 +250,23 @@ void GnomeFileManager::CopyFiles(std::set<std::string> const& uris, std::string 
 
   g_variant_builder_close(&b);
   g_variant_builder_add(&b, "s", dest.c_str());
-  g_variant_builder_add(&b, "u", timestamp);
+  g_variant_builder_add_value(&b, impl_->GetPlatformData(timestamp, parent_xid));
   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("CopyURIsWithTimestamp", parameters, [proxy] (GVariant*, glib::Error const&) {});
+    proxy->CallBegin("CopyURIs", parameters, [proxy] (GVariant*, glib::Error const&) {});
   }
 }
 
 WindowList GnomeFileManager::WindowsForLocation(std::string const& location) const
 {
   std::vector<ApplicationWindowPtr> windows;
-  auto& app_manager = ApplicationManager::Default();
-
   glib::Object<GFile> location_file(g_file_new_for_uri(location.c_str()));
 
-  for (auto const& pair : impl_->opened_location_for_xid_)
+  for (auto const& pair : impl_->opened_location_for_window_)
   {
     auto const& loc = pair.second;
     bool matches = (loc == location);
@@ -245,7 +280,7 @@ WindowList GnomeFileManager::WindowsForLocation(std::string const& location) con
 
     if (matches)
     {
-      auto const& win = app_manager.GetWindowForId(pair.first);
+      auto const& win = pair.first;
 
       if (win && std::find(windows.rbegin(), windows.rend(), win) == windows.rend())
         windows.push_back(win);
@@ -259,9 +294,9 @@ std::string GnomeFileManager::LocationForWindow(ApplicationWindowPtr const& win)
 {
   if (win)
   {
-    auto it = impl_->opened_location_for_xid_.find(win->window_id());
+    auto it = impl_->opened_location_for_window_.find(win);
 
-    if (it != end(impl_->opened_location_for_xid_))
+    if (it != end(impl_->opened_location_for_window_))
       return it->second;
   }
 
diff --git a/unity-shared/GnomeFileManager.h b/unity-shared/GnomeFileManager.h
index 8f3b3c3..b9c3dd8 100644
--- a/unity-shared/GnomeFileManager.h
+++ b/unity-shared/GnomeFileManager.h
@@ -35,9 +35,9 @@ public:
   void Open(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);
+  void CopyFiles(std::set<std::string> const& uris, std::string const& dest, uint64_t timestamp, Window parent_xid);
   bool TrashFile(std::string const& uri);
-  void EmptyTrash(uint64_t timestamp);
+  void EmptyTrash(uint64_t timestamp, Window parent_xid);
 
   WindowList WindowsForLocation(std::string const& location) const;
   std::string LocationForWindow(ApplicationWindowPtr const&) const;
diff --git a/unity-shared/IntrospectionData.cpp b/unity-shared/IntrospectionData.cpp
index 2dbb393..495e175 100644
--- a/unity-shared/IntrospectionData.cpp
+++ b/unity-shared/IntrospectionData.cpp
@@ -55,7 +55,6 @@ IntrospectionData::~IntrospectionData()
 GVariant* IntrospectionData::Get() const
 {
   GVariant* data = g_variant_builder_end(builder_);
-  g_clear_pointer(&builder_, g_variant_builder_unref);
   return data;
 }