Merge branch 'master' into cairocanvas

1 files changed, 2 insertions, 27 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 57ae65e9a5..2b430c8a40 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -47,6 +47,7 @@
 #include "pbd/stacktrace.h"
 
 #include <glibmm/miscutils.h>
+#include <glibmm/uriutils.h>
 #include <gtkmm/image.h>
 #include <gdkmm/color.h>
 #include <gdkmm/bitmap.h>
@@ -3178,33 +3179,8 @@ Editor::convert_drop_to_paths (
 	}
 
 	for (vector<string>::iterator i = uris.begin(); i != uris.end(); ++i) {
-
 		if ((*i).substr (0,7) == "file://") {
-
-			string const p = PBD::url_decode (*i);
-
-			// scan forward past three slashes
-
-			string::size_type slashcnt = 0;
-			string::size_type n = 0;
-			string::const_iterator x = p.begin();
-
-			while (slashcnt < 3 && x != p.end()) {
-				if ((*x) == '/') {
-					slashcnt++;
-				} else if (slashcnt == 3) {
-					break;
-				}
-				++n;
-				++x;
-			}
-
-			if (slashcnt != 3 || x == p.end()) {
-				error << _("malformed URL passed to drag-n-drop code") << endmsg;
-				continue;
-			}
-
-			paths.push_back (p.substr (n - 1));
+			paths.push_back (Glib::filename_from_uri (*i));
 		}
 	}
 
@@ -3213,7 +3189,6 @@ Editor::convert_drop_to_paths (
 
 void
 Editor::new_tempo_section ()
-
 {
 }