From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sat, 17 Sep 2011 11:04:55 +0000 (+0000)
Subject: Revert unintended part of r39694.
X-Git-Tag: 2.1.0beta1~2700
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a44b40c604c0a6298bf542c82575452ab8139d67;p=features.git

Revert unintended part of r39694.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39695 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 00334dc2a8..2e0f37a11c 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -898,7 +898,7 @@ void GuiView::dropEvent(QDropEvent * event)
 			= theConverters().importableFormats();
 		vector<const Format *>::const_iterator it = import_formats.begin();
 		for (; it != import_formats.end(); ++it)
-			if ((*it)->extension() == ext)
+			if ((*it)->hasExtension(ext))
 				found_formats.push_back(*it);
 
 		FuncRequest cmd;
@@ -2067,10 +2067,10 @@ void GuiView::importDocument(string const & argument)
 			toqstr(addPath(package().system_support().absFileName(), "examples")));
 
 		docstring filter = formats.prettyName(format);
-		filter += " (*.";
+		filter += " (*.{";
 		// FIXME UNICODE
-		filter += from_utf8(formats.extension(format));
-		filter += ')';
+		filter += from_utf8(formats.extensions(format));
+		filter += "})";
 
 		FileDialog::Result result =
 			dlg.open(toqstr(initpath), fileFilters(toqstr(filter)));