Merge lp:~3v1n0/unity/filemanager-operations-timestamp into lp:unity

[Marco Trevisan (Treviño)]

GnomeFileManager: use *WithTimestamp file operations instead of using Activate workaround

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4112
http://jenkins.qa.ubuntu.com/job/unity-ci/1378/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1378/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'unity-shared/GnomeFileManager.cpp'
--- unity-shared/GnomeFileManager.cpp	2015-12-11 17:59:00 +0000
+++ unity-shared/GnomeFileManager.cpp	2015-12-11 17:59:00 +0000
@@ -169,39 +169,6 @@
   Open(TRASH_URI, timestamp);
 }
 
-void GnomeFileManager::Activate(uint64_t timestamp)
-{
-  glib::Cancellable cancellable;
-  glib::Object<GFile> file(g_file_new_for_uri(TRASH_URI.c_str()));
-  glib::Object<GAppInfo> app_info(g_file_query_default_handler(file, cancellable, nullptr));
-
-  if (app_info)
-  {
-    GdkDisplay* display = gdk_display_get_default();
-    glib::Object<GdkAppLaunchContext> context(gdk_display_get_app_launch_context(display));
-
-    if (timestamp > 0)
-      gdk_app_launch_context_set_timestamp(context, timestamp);
-
-    auto const& gcontext = glib::object_cast<GAppLaunchContext>(context);
-    auto proxy = std::make_shared<glib::DBusProxy>(NAUTILUS_NAME, NAUTILUS_PATH,
-                                                   "org.freedesktop.Application");
-
-    glib::String context_string(g_app_launch_context_get_startup_notify_id(gcontext, app_info, nullptr));
-
-    if (context_string && g_utf8_validate(context_string, -1, nullptr))
-    {
-      GVariantBuilder builder;
-      g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
-      g_variant_builder_add(&builder, "{sv}", "desktop-startup-id", g_variant_new("s", context_string.Value()));
-      GVariant *param = g_variant_new("(@a{sv})", g_variant_builder_end(&builder));
-
-      // Passing the proxy to the lambda we ensure that it will be destroyed when needed
-      proxy->CallBegin("Activate", param, [proxy] (GVariant*, glib::Error const&) {});
-    }
-  }
-}
-
 bool GnomeFileManager::TrashFile(std::string const& uri)
 {
   glib::Cancellable cancellable;
@@ -217,11 +184,10 @@
 
 void GnomeFileManager::EmptyTrash(uint64_t timestamp)
 {
-  Activate(timestamp);
   auto const& proxy = impl_->NautilusOperationsProxy();
 
   // Passing the proxy to the lambda we ensure that it will be destroyed when needed
-  proxy->CallBegin("EmptyTrash", nullptr, [proxy] (GVariant*, glib::Error const&) {});
+  proxy->CallBegin("EmptyTrashWithTimestamp", g_variant_new("(u)", timestamp), [proxy] (GVariant*, glib::Error const&) {});
 }
 
 void GnomeFileManager::CopyFiles(std::set<std::string> const& uris, std::string const& dest, uint64_t timestamp)
@@ -231,7 +197,7 @@
 
   bool found_valid = false;
   GVariantBuilder b;
-  g_variant_builder_init(&b, G_VARIANT_TYPE("(ass)"));
+  g_variant_builder_init(&b, G_VARIANT_TYPE("(assu)"));
   g_variant_builder_open(&b, G_VARIANT_TYPE("as"));
 
   for (auto const& uri : uris)
@@ -245,14 +211,14 @@
 
   g_variant_builder_close(&b);
   g_variant_builder_add(&b, "s", dest.c_str());
+  g_variant_builder_add(&b, "u", timestamp);
   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);
+    proxy->CallBegin("CopyURIsWithTimestamp", parameters, [proxy] (GVariant*, glib::Error const&) {});
   }
 }
 
 
=== modified file 'unity-shared/GnomeFileManager.h'
--- unity-shared/GnomeFileManager.h	2015-12-11 17:59:00 +0000
+++ unity-shared/GnomeFileManager.h	2015-12-11 17:59:00 +0000
@@ -44,7 +44,6 @@
 
 private:
   GnomeFileManager();
-  void Activate(uint64_t timestamp);
 
   struct Impl;
   std::unique_ptr<Impl> impl_;