Merge lp:~kamstrup/unity-lens-files/bookmarks-handling into lp:unity-lens-files

[Mikkel Kamstrup Erlandsen]

Open FTP bookmarks in the default handler for inode/directory. This makes FTP bookmarks open in Nautilus. Note this only applies on *bookmarks*. Incidentally this also fixes automounting of remote shares (except in the cases where GIO b0rks it (FTP works well, SSH not so much))

[Michal Hruby (mhr3)]

> if (launcher == null)

I think we should fallback here to opening it via default handler for the uri scheme.

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

Fallback is handled in:

18 + if (!bookmarks.launch_if_bookmark (uri))
19 + AppInfo.launch_default_for_uri (uri, null);

[lp:~kamstrup/unity-lens-files/bookmarks-handling]

194. By Mikkel Kamstrup Erlandsen on 2011-09-29

Let errors from bookmark launching bubble up to the main activation handler

[Michal Hruby (mhr3)]

Very well then, let's have some error dialogs :)

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-09-29 11:44:16 +0000
+++ src/daemon.vala	2011-09-29 12:09:23 +0000
@@ -650,7 +650,7 @@
       {
         results_model.append (bookmark.uri, bookmark.icon, category,
                               bookmark.mimetype, bookmark.display_name,
-                              bookmark.uri);
+                              bookmark.dnd_uri);
       }
     }
 
@@ -713,7 +713,8 @@
     {
       debug (@"Activating: $uri");
       try {
-        AppInfo.launch_default_for_uri (uri, null);
+        if (!bookmarks.launch_if_bookmark (uri))
+          AppInfo.launch_default_for_uri (uri, null);
         return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
       } catch (GLib.Error error) {
         warning ("Failed to launch URI %s", uri);

=== modified file 'src/folder.vala'
--- src/folder.vala	2011-09-22 08:49:28 +0000
+++ src/folder.vala	2011-09-29 12:09:23 +0000
@@ -168,6 +168,29 @@
       
       return filter_bookmarks (matches);
     }
+      
+    public bool launch_if_bookmark (string uri) throws Error
+    {
+      if (!uri.has_prefix ("bookmark:"))
+        return false;
+      
+      var launcher = AppInfo.get_default_for_type ("inode/directory", true);
+      
+      uri = uri.offset (9); // Remove "bookmark:" prefix from uri
+      
+      if (launcher == null)
+        {
+          warning ("No default handler for inode/directory. Unable to open bookmark '%s'", uri);
+          throw new IOError.FAILED ("No default handler for inode/directory. Unable to open bookmark '%s'", uri);
+        }
+      
+      var uris = new List<string> ();
+      uris.append (uri);
+      
+      launcher.launch_uris (uris, new AppLaunchContext());
+      
+      return true;
+    }
   
   }
   
@@ -177,13 +200,14 @@
     public string icon { get; set construct; }
     public string mimetype { get; set construct; }
     public string display_name { get; set construct; }
+    public string dnd_uri { get; set construct; }
     
     private List<string> index_terms;
   
     public Bookmark (string uri, string mimetype, string display_name)
     {
-      Object (uri:uri, icon:Utils.get_icon_for_uri (uri, mimetype),
-              mimetype:mimetype, display_name:display_name);
+      Object (uri:"bookmark:"+uri, icon:Utils.get_icon_for_uri (uri, mimetype),
+              mimetype:mimetype, display_name:display_name, dnd_uri:uri);
       
       index_terms = new List<string> ();
       index_terms.append (Utils.normalize_string (Path.get_basename (uri)));