Merge lp:~3v1n0/unity/dash-files-open into lp:unity/7.0

[Marco Trevisan (Treviño)]

Lens: if a lens returns a "goto-uri" parameter, activate that instead of the activated uri

DashView: use FileManager to launch an activated location, in case opening it.

We use the "goto-uri" parameter that a Lens can return to activate the lens-parsed location, using FileManager with correct timestamp to open or launch files.

This depends on lp:~3v1n0/unity-lens-files/delegate-activation/+merge/162007

[lp:~3v1n0/unity/dash-files-open]

3318. By Marco Trevisan (Treviño) on 2013-05-02

TestDashView: use our beloved beef

3319. By Marco Trevisan (Treviño) on 2013-05-02

TestLensService: update to support goto-uri redirection

3320. By Marco Trevisan (Treviño) on 2013-05-02

TestLens: add activation redirection test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3317
http://jenkins.qa.ubuntu.com/job/unity-7.0-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-7.0-ci/6/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3320
http://jenkins.qa.ubuntu.com/job/unity-7.0-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-7.0-ci/8/rebuild

review: Approve (continuous-integration)

Unmerged revisions

3320. By Marco Trevisan (Treviño) on 2013-05-02

TestLens: add activation redirection test

3319. By Marco Trevisan (Treviño) on 2013-05-02

TestLensService: update to support goto-uri redirection

3318. By Marco Trevisan (Treviño) on 2013-05-02

TestDashView: use our beloved beef

3317. By Marco Trevisan (Treviño) on 2013-05-01

TestDashView: add tests for Filemanager Launch and Opening

3316. By Marco Trevisan (Treviño) on 2013-05-01

DashView: use FileManager to launch an activated location, in case opening it.

3315. By Marco Trevisan (Treviño) on 2013-05-01

Lens: if a lens returns a "goto-uri" parameter, activate that instead of the activated uri

3314. By Marco Trevisan (Treviño) on 2013-05-01

GnomeFileManager: add Launch Implementation, to launch a file with default handler

3313. By Marco Trevisan (Treviño) on 2013-04-23

GnomeFileManager: add Utility function to get the Launch Context

3312. By Marco Trevisan (Treviño) on 2013-04-22

GnomeFileManager: If the requested location is not mounted, we open the file-manager

If the requested position is not mounted, we open the file-manager waiting it to mount
the requested location.

3311. By Marco Trevisan (Treviño) on 2013-04-22

FileManager: return a bool on Open methods.

=== modified file 'UnityCore/Lens.cpp'
--- UnityCore/Lens.cpp	2013-03-21 19:11:44 +0000
+++ UnityCore/Lens.cpp	2013-05-02 01:34:26 +0000
@@ -509,7 +509,7 @@
   guint32 handled;
   GVariant* hints_variant;
   Hints hints;
-  
+
   g_variant_get(parameters, "((su@a{sv}))", &uri, &handled, &hints_variant);
 
   glib::Variant dict (hints_variant, glib::StealRef());
@@ -536,7 +536,15 @@
   }
   else
   {
-    owner_->activated.emit(uri.Str(), static_cast<HandledType>(handled), hints);
+    auto activated_uri = uri.Str();
+
+    auto iter = hints.find("goto-uri");
+    if (iter != hints.end())
+    {
+      activated_uri = "goto-uri:" + iter->second.GetString();
+    }
+
+    owner_->activated.emit(activated_uri, static_cast<HandledType>(handled), hints);
   }
 }
 
 
=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2013-04-10 20:59:51 +0000
+++ dash/DashController.cpp	2013-05-02 01:34:26 +0000
@@ -23,7 +23,6 @@
 #include <Nux/HLayout.h>
 #include <UnityCore/GLibWrapper.h>
 
-#include "ApplicationStarterImp.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UBusMessages.h"
@@ -140,7 +139,7 @@
 
 void Controller::SetupDashView()
 {
-  view_ = new DashView(std::make_shared<FilesystemLenses>(), std::make_shared<ApplicationStarterImp>());
+  view_ = new DashView(std::make_shared<FilesystemLenses>());
   AddChild(view_);
 
   nux::HLayout* layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-04-12 16:01:19 +0000
+++ dash/DashView.cpp	2013-05-02 01:34:26 +0000
@@ -20,6 +20,7 @@
 
 #include "DashView.h"
 #include "DashViewPrivate.h"
+#include "ApplicationStarterImp.h"
 #include "FilterExpanderLabel.h"
 
 #include <math.h>
@@ -31,6 +32,7 @@
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/RadioOptionFilter.h>
 
+#include "unity-shared/GnomeFileManager.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/KeyboardUtil.h"
 #include "unity-shared/PreviewStyle.h"
@@ -56,6 +58,10 @@
 const int GROUP_HEADING_HEIGHT = 24;
 
 const int PREVIEW_ICON_SPLIT_OFFSCREEN_OFFSET = 10;
+
+const std::string RESULT_APPLICATION_PREFIX = "application://";
+const std::string RESULT_RUNNER_PREFIX = "unity-runner://";
+const std::string RESULT_DIRECTORY_PREFIX = "directory://";
 }
 
 // This is so we can access some protected members in nux::VLayout and
@@ -109,11 +115,12 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(DashView);
 
-DashView::DashView(Lenses::Ptr const& lenses, ApplicationStarter::Ptr const& application_starter)
+DashView::DashView(Lenses::Ptr const& lenses, ApplicationStarter::Ptr const& application_starter, FileManager::Ptr const& file_manager)
   : nux::View(NUX_TRACKER_LOCATION)
   , lenses_(lenses)
   , home_lens_(new HomeLens(_("Home"), _("Home screen"), _("Search your computer and online sources")))
-  , application_starter_(application_starter)
+  , application_starter_(application_starter ? application_starter : std::make_shared<ApplicationStarterImp>())
+  , file_manager_(file_manager ? file_manager : GnomeFileManager::Get())
   , preview_container_(nullptr)
   , preview_displaying_(false)
   , preview_navigation_mode_(previews::Navigation::NONE)
@@ -1380,18 +1387,25 @@
 
   LOG_DEBUG(logger) << "Fallback activating " << uri;
 
-  if (g_str_has_prefix(uri.c_str(), "application://"))
-  {
-    std::string const& appname = uri.substr(14);
-    return application_starter_->Launch(appname, last_activated_timestamp_);
-  }
-  else if (g_str_has_prefix(uri.c_str(), "unity-runner://"))
-  {
-    std::string const& appname = uri.substr(15);
-    return application_starter_->Launch(appname, last_activated_timestamp_);
+  if (uri.find(RESULT_APPLICATION_PREFIX) == 0)
+  {
+    std::string const& appname = uri.substr(RESULT_APPLICATION_PREFIX.size());
+    return application_starter_->Launch(appname, last_activated_timestamp_);
+  }
+  else if (uri.find(RESULT_RUNNER_PREFIX) == 0)
+  {
+    std::string const& appname = uri.substr(RESULT_RUNNER_PREFIX.size());
+    return application_starter_->Launch(appname, last_activated_timestamp_);
+  }
+  else if (uri.find(RESULT_DIRECTORY_PREFIX) == 0)
+  {
+    std::string const& directory = uri.substr(RESULT_DIRECTORY_PREFIX.size());
+    return file_manager_->Open(directory, last_activated_timestamp_);
   }
   else
-    return gtk_show_uri(NULL, uri.c_str(), last_activated_timestamp_, NULL);
+  {
+    return file_manager_->Launch(uri, last_activated_timestamp_);
+  }
 
   return false;
 }
 
=== modified file 'dash/DashView.h'
--- dash/DashView.h	2013-04-10 18:26:42 +0000
+++ dash/DashView.h	2013-05-02 01:34:26 +0000
@@ -37,6 +37,7 @@
 
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "unity-shared/BGHash.h"
+#include "unity-shared/FileManager.h"
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/OverlayRenderer.h"
 #include "unity-shared/SearchBar.h"
@@ -59,7 +60,9 @@
   typedef std::map<std::string, nux::ObjectPtr<LensView>> LensViews;
 
 public:
-   DashView(Lenses::Ptr const& lenses, ApplicationStarter::Ptr const& application_starter);
+   DashView(Lenses::Ptr const& lenses,
+            ApplicationStarter::Ptr const& application_starter = nullptr,
+            FileManager::Ptr const& file_manager = nullptr);
   ~DashView();
 
   void AboutToShow();
@@ -139,6 +142,7 @@
   LensViews lens_views_;
 
   ApplicationStarter::Ptr application_starter_;
+  FileManager::Ptr file_manager_;
 
   // View related
   PreviewStateMachine preview_state_machine_;
 
=== modified file 'dash/StandaloneDash.cpp'
--- dash/StandaloneDash.cpp	2013-03-12 15:21:19 +0000
+++ dash/StandaloneDash.cpp	2013-05-02 01:34:26 +0000
@@ -28,7 +28,6 @@
 #include <NuxCore/AnimationController.h>
 #include <NuxCore/Logger.h>
 
-#include "ApplicationStarterImp.h"
 #include "unity-shared/BGHash.h"
 #include "unity-shared/FontSettings.h"
 #include "DashView.h"
@@ -65,8 +64,7 @@
 {
   layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
-  DashView* view = new DashView(std::make_shared<unity::dash::FilesystemLenses>(), 
-                                std::make_shared<unity::ApplicationStarterImp>());
+  DashView* view = new DashView(std::make_shared<unity::dash::FilesystemLenses>());
   view->DisableBlur();
   view->SetMinMaxSize(WIDTH, HEIGHT);
   layout->AddView (view, 1, nux::MINOR_POSITION_CENTER);
 
=== modified file 'tests/test_dash_view.cpp'
--- tests/test_dash_view.cpp	2013-03-12 21:45:58 +0000
+++ tests/test_dash_view.cpp	2013-05-02 01:34:26 +0000
@@ -20,11 +20,11 @@
 
 #include <UnityCore/Lenses.h>
 
-#include "ApplicationStarter.h"
 #include "DashView.h"
 #include "unity-shared/DashStyle.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UnitySettings.h"
+#include "test_mock_filemanager.h"
 
 #include "mock-lenses.h"
 
@@ -43,7 +43,8 @@
   TestDashView()
     : lenses_(std::make_shared<testmocks::ThreeMockTestLenses>())
     , application_starter_(std::make_shared<MockApplicationStarter>())
-    , dash_view_(new DashView(lenses_, application_starter_))
+    , file_manager_(std::make_shared<NiceMock<unity::MockFileManager>>())
+    , dash_view_(new DashView(lenses_, application_starter_, file_manager_))
   {}
 
   unity::Settings unity_settings_;
@@ -51,11 +52,12 @@
   unity::panel::Style panel_style;
   Lenses::Ptr lenses_;
   MockApplicationStarter::Ptr application_starter_;
+  unity::MockFileManager::Ptr file_manager_;
   nux::ObjectPtr<DashView> dash_view_;
 };
 
 
-TEST_F(TestDashView, LensActivatedSignal)
+TEST_F(TestDashView, LensActivatedApplication)
 {
   EXPECT_CALL(*application_starter_, Launch("uri", _)).Times(1);
   lenses_->GetLensAtIndex(0)->activated.emit("0xaabbcc:application://uri", NOT_HANDLED, Lens::Hints());
@@ -64,4 +66,16 @@
   lenses_->GetLensAtIndex(0)->activated.emit("0xaabbcc:unity-runner://uri", NOT_HANDLED, Lens::Hints());
 }
 
+TEST_F(TestDashView, LensActivatedDirectory)
+{
+  EXPECT_CALL(*file_manager_, Open("file:///dir/file.ext", _));
+  lenses_->GetLensAtIndex(0)->activated.emit("goto-uri:directory://file:///dir/file.ext", NOT_HANDLED, Lens::Hints());
+}
+
+TEST_F(TestDashView, LensActivatedAny)
+{
+  EXPECT_CALL(*file_manager_, Launch("file:///dir/file.ext", _));
+  lenses_->GetLensAtIndex(0)->activated.emit("0xdeadbeef:file:///dir/file.ext", NOT_HANDLED, Lens::Hints());
+}
+
 }
 
=== modified file 'tests/test_lens.cpp'
--- tests/test_lens.cpp	2013-03-04 11:31:36 +0000
+++ tests/test_lens.cpp	2013-05-02 01:34:26 +0000
@@ -1,4 +1,3 @@
-#include <boost/lexical_cast.hpp>
 #include <gtest/gtest.h>
 #include <glib-object.h>
 
@@ -66,13 +65,13 @@
     ASSERT_EQ(model->count(), n_rows);
   }
 
-  std::string PopulateAndGetFirstResultURI()
+  std::string PopulateAndGetFirstResultURI(bool redirect = false)
   {
     Results::Ptr results = lens_->results;
 
-    lens_->Search("Test Search String", nullptr);
+    lens_->Search(redirect ? "redirect" : "Test Search String", nullptr);
     WaitForModel<Result>(results.get(), 5);
-    
+
     Result result = results->RowAtIndex(0);
     return result.uri;
   }
@@ -134,18 +133,18 @@
 
   for (unsigned int i = 0; i < 5; i++)
   {
-    std::string name("Test Search String" + boost::lexical_cast<std::string>(i));
+    std::string name("Test Search String" + std::to_string(i));
 
     Result result = results->RowAtIndex(i);
     
     std::string uri = result.uri;
-    EXPECT_TRUE(uri.find("file:///test"));
+    EXPECT_TRUE(uri.find("file:///test/"+std::to_string(i)));
     EXPECT_EQ(result.icon_hint, "gtk-apply");
     EXPECT_EQ(result.category_index, i);
     EXPECT_EQ(result.mimetype, "text/html");
     EXPECT_EQ(result.name, name);
     EXPECT_EQ(result.comment, "kamstrup likes ponies");
-    EXPECT_EQ(result.dnd_uri, "file:///test");
+    EXPECT_EQ(result.dnd_uri, "file:///test/"+std::to_string(i));
   }
 }
 
@@ -158,18 +157,18 @@
 
   for (unsigned int i = 0; i < 10; i++)
   {
-    std::string name("Test Global Search String" + boost::lexical_cast<std::string>(i));
+    std::string name("Test Global Search String" + std::to_string(i));
 
     Result result = results->RowAtIndex(i);
 
     std::string uri = result.uri;
-    EXPECT_TRUE(uri.find("file:///test"));
+    EXPECT_TRUE(uri.find("file:///test/"+std::to_string(i)));
     EXPECT_EQ(result.icon_hint, "gtk-apply");
     EXPECT_EQ(result.category_index, i);
     EXPECT_EQ(result.mimetype, "text/html");
     EXPECT_EQ(result.name, name);
     EXPECT_EQ(result.comment, "kamstrup likes ponies");
-    EXPECT_EQ(result.dnd_uri, "file:///test");
+    EXPECT_EQ(result.dnd_uri, "file:///test/"+std::to_string(i));
   }
 }
 
@@ -193,6 +192,25 @@
   Utils::WaitUntil(activated);
 }
 
+TEST_F(TestLens, TestActivationRedirect)
+{
+  std::string uri = PopulateAndGetFirstResultURI(true);
+
+  bool activated = false;
+  auto activated_cb = [&activated, &uri] (std::string const& uri_,
+                                          HandledType handled,
+                                          Lens::Hints const& hints)
+  {
+    EXPECT_EQ(uri_, "goto-uri:"+uri.substr(uri.find(":")+1));
+    EXPECT_EQ(handled, HandledType::HIDE_DASH);
+    activated = true;
+  };
+  lens_->activated.connect(activated_cb);
+
+  lens_->Activate(uri);
+  Utils::WaitUntil(activated);
+}
+
 TEST_F(TestLens, TestPreview)
 {
   std::string uri = PopulateAndGetFirstResultURI();
 
=== modified file 'tests/test_mock_filemanager.h'
--- tests/test_mock_filemanager.h	2013-03-29 17:44:12 +0000
+++ tests/test_mock_filemanager.h	2013-05-02 01:34:26 +0000
@@ -29,9 +29,10 @@
 {
   typedef std::shared_ptr<MockFileManager> Ptr;
 
-  MOCK_METHOD2(Open, void(std::string const& uri, unsigned long long time));
-  MOCK_METHOD2(OpenActiveChild, void(std::string const& uri, unsigned long long time));
-  MOCK_METHOD1(OpenTrash, void(unsigned long long time));
+  MOCK_METHOD2(Open, bool(std::string const& uri, unsigned long long time));
+  MOCK_METHOD2(OpenActiveChild, bool(std::string const& uri, unsigned long long time));
+  MOCK_METHOD1(OpenTrash, bool(unsigned long long time));
+  MOCK_METHOD2(Launch, bool(std::string const& uri, unsigned long long time));
   MOCK_METHOD1(EmptyTrash, void(unsigned long long time));
   MOCK_CONST_METHOD0(OpenedLocations, std::vector<std::string>());
   MOCK_CONST_METHOD1(IsPrefixOpened, bool(std::string const& uri));
 
=== modified file 'tests/test_service_lens.cpp'
--- tests/test_service_lens.cpp	2013-03-04 11:31:36 +0000
+++ tests/test_service_lens.cpp	2013-05-02 01:34:26 +0000
@@ -118,21 +118,22 @@
   int num_items = search_type == UNITY_SEARCH_TYPE_GLOBAL ? 10 : 5;
 
   DeeModel* model = (DeeModel*)unity_lens_search_get_results_model(search);
+  bool redirect = (g_strcmp0(unity_lens_search_get_search_string(search), "redirect") == 0);
+
+  dee_model_clear(model);
 
   for (i = 0; i < num_items; i++)
   {
-    gchar* name = g_strdup_printf("%s%d",
-                                  unity_lens_search_get_search_string(search),
-                                  i);
+    std::string name = unity_lens_search_get_search_string(search) + std::to_string(i);
+    std::string uri = (redirect ? "file:///test/redirect/" : "file:///test/") + std::to_string(i);
     dee_model_append(model,
-                     "file:///test",
+                     uri.c_str(),
                      "gtk-apply",
                      i,
                      "text/html",
-                     name,
+                     name.c_str(),
                      "kamstrup likes ponies",
-                     "file:///test");
-    g_free(name);
+                     uri.c_str());
   }
 
   unity_lens_search_finished (search);
@@ -140,11 +141,17 @@
 
 static UnityActivationResponse* on_activate_uri(UnityScope* scope, const char* uri, Lens* self)
 {
+  if (strstr(uri, "/redirect/"))
+    return unity_activation_response_new(UNITY_HANDLED_TYPE_HIDE_DASH, uri);
+
   return unity_activation_response_new(UNITY_HANDLED_TYPE_HIDE_DASH, "");
 }
 
 static UnityActivationResponse* preview_action_activated(UnityPreviewAction* action, const char* uri)
 {
+  if (strstr(uri, "/redirect/"))
+    return unity_activation_response_new(UNITY_HANDLED_TYPE_HIDE_DASH, uri);
+
   return unity_activation_response_new(UNITY_HANDLED_TYPE_SHOW_DASH, "");
 }
 
 
=== modified file 'unity-shared/FileManager.h'
--- unity-shared/FileManager.h	2013-04-10 22:13:44 +0000
+++ unity-shared/FileManager.h	2013-05-02 01:34:26 +0000
@@ -37,13 +37,17 @@
   FileManager() = default;
   virtual ~FileManager() {}
 
-  virtual void Open(std::string const& uri, unsigned long long timestamp = 0) = 0;
-  virtual void OpenActiveChild(std::string const& uri, unsigned long long timestamp = 0) = 0;
-  virtual void OpenTrash(unsigned long long timestamp) = 0;
+  virtual bool Open(std::string const& uri, unsigned long long timestamp = 0) = 0;
+  virtual bool OpenActiveChild(std::string const& uri, unsigned long long timestamp = 0) = 0;
+  virtual bool OpenTrash(unsigned long long timestamp) = 0;
+
+  virtual bool Launch(std::string const& uri, unsigned long long timestamp = 0) = 0;
+
   virtual std::vector<std::string> OpenedLocations() const = 0;
   virtual bool IsPrefixOpened(std::string const& uri) const = 0;
   virtual bool IsTrashOpened() const = 0;
   virtual bool IsDeviceOpened() const = 0;
+
   virtual void EmptyTrash(unsigned long long timestamp = 0) = 0;
 
   sigc::signal<void> locations_changed;
 
=== modified file 'unity-shared/GnomeFileManager.cpp'
--- unity-shared/GnomeFileManager.cpp	2013-03-29 17:44:12 +0000
+++ unity-shared/GnomeFileManager.cpp	2013-05-02 01:34:26 +0000
@@ -36,6 +36,7 @@
 const std::string TRASH_URI = "trash:";
 const std::string TRASH_PATH = "file://" + DesktopUtilities::GetUserDataDirectory() + "/Trash/files";
 const std::string DEVICES_PREFIX = "file:///media/" + std::string(g_get_user_name());
+const std::string FOLDER_TYPE = "inode/directory";
 }
 
 struct GnomeFileManager::Impl
@@ -93,6 +94,15 @@
     return "";
   }
 
+  static glib::Object<GAppLaunchContext> GetLaunchContext(long long timestamp)
+  {
+    GdkDisplay* display = gdk_display_get_default();
+    glib::Object<GdkAppLaunchContext> context(gdk_display_get_app_launch_context(display));
+    gdk_app_launch_context_set_timestamp(context, timestamp);
+
+    return glib::object_cast<GAppLaunchContext>(context);
+  }
+
   GnomeFileManager* parent_;
   glib::DBusProxy filemanager_proxy_;
   std::vector<std::string> opened_locations_;
@@ -112,46 +122,67 @@
 GnomeFileManager::~GnomeFileManager()
 {}
 
-void GnomeFileManager::Open(std::string const& uri, unsigned long long timestamp)
+bool GnomeFileManager::Launch(std::string const& uri, unsigned long long timestamp)
 {
   if (uri.empty())
   {
-    LOG_ERROR(logger) << "Impossible to open an empty location";
-    return;
+    LOG_ERROR(logger) << "Impossible to launch the application for an empty location";
+    return false;
   }
 
   glib::Error error;
-  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 const& gcontext = Impl::GetLaunchContext(timestamp);
   g_app_info_launch_default_for_uri(uri.c_str(), gcontext, &error);
 
   if (error)
   {
-    LOG_ERROR(logger) << "Impossible to open the location: " << error.Message();
-  }
-}
-
-void GnomeFileManager::OpenActiveChild(std::string const& uri, unsigned long long timestamp)
+    if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED))
+    {
+      /* If the location is not mounted, then we open the file-manager to make
+       * it mount the requested position */
+      return Open(uri, timestamp);
+    }
+
+    LOG_ERROR(logger) << "Impossible to launch the location: " << error;
+    return false;
+  }
+
+  return true;
+}
+
+bool GnomeFileManager::Open(std::string const& uri, unsigned long long timestamp)
+{
+  glib::Error error;
+  glib::Object<GAppInfo> app_info(g_app_info_get_default_for_type(FOLDER_TYPE.c_str(), TRUE));
+  std::shared_ptr<GList> uris(g_list_append(nullptr, const_cast<char*>(uri.c_str())), g_list_free);
+
+  g_app_info_launch_uris(app_info, uris.get(), Impl::GetLaunchContext(timestamp), &error);
+
+  if (error)
+  {
+    LOG_ERROR(logger) << "Impossible to open the location: " << error;
+    return false;
+  }
+
+  return true;
+}
+
+bool GnomeFileManager::OpenActiveChild(std::string const& uri, unsigned long long timestamp)
 {
   auto const& opened = impl_->GetOpenedPrefix(uri);
 
-  Open(opened.empty() ? uri : opened, timestamp);
+  return Open(opened.empty() ? uri : opened, timestamp);
 }
 
-void GnomeFileManager::OpenTrash(unsigned long long timestamp)
+bool GnomeFileManager::OpenTrash(unsigned long long timestamp)
 {
   if (IsPrefixOpened(TRASH_PATH))
   {
-    OpenActiveChild(TRASH_PATH, timestamp);
+    return OpenActiveChild(TRASH_PATH, timestamp);
   }
   else
   {
-    OpenActiveChild(TRASH_URI, timestamp);
+    return OpenActiveChild(TRASH_URI, timestamp);
   }
 }
 
@@ -163,17 +194,11 @@
 
   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>("org.gnome.NautilusApplication",
                                                    "/org/gnome/NautilusApplication",
                                                    "org.gtk.Application");
 
+    auto const& gcontext = Impl::GetLaunchContext(timestamp);
     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))
 
=== modified file 'unity-shared/GnomeFileManager.h'
--- unity-shared/GnomeFileManager.h	2013-03-29 17:44:12 +0000
+++ unity-shared/GnomeFileManager.h	2013-05-02 01:34:26 +0000
@@ -32,15 +32,19 @@
   static FileManager::Ptr Get();
   ~GnomeFileManager();
 
-  void Open(std::string const& uri, unsigned long long timestamp);
-  void OpenActiveChild(std::string const& uri, unsigned long long timestamp);
-  void OpenTrash(unsigned long long timestamp);
-  void EmptyTrash(unsigned long long timestamp);
+  bool Open(std::string const& uri, unsigned long long timestamp);
+  bool OpenActiveChild(std::string const& uri, unsigned long long timestamp);
+  bool OpenTrash(unsigned long long timestamp);
+
+  bool Launch(std::string const& uri, unsigned long long timestamp);
+
   std::vector<std::string> OpenedLocations() const;
   bool IsPrefixOpened(std::string const& uri) const;
   bool IsTrashOpened() const;
   bool IsDeviceOpened() const;
 
+  void EmptyTrash(unsigned long long timestamp);
+
 private:
   GnomeFileManager();
   void Activate(unsigned long long timestamp);