X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FToolbarBackend.C;h=b12fed44df1b0f956d33e2acc45285935a02072b;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=970829b1aa285dd0f0666597eba8a525ce29b2c1;hpb=78aa7c69879a001657838d54f8d149af6507978b;p=lyx.git

diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index 970829b1aa..b12fed44df 100644
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -97,7 +97,7 @@ void ToolbarBackend::read(LyXLex & lex)
 		switch (lex.lex()) {
 		case TO_ADD:
 			if (lex.next(true)) {
-				docstring const tooltip = _(lex.getString());
+				docstring const tooltip = translateIfPossible(lex.getDocString());
 				lex.next(true);
 				string const func_arg = lex.getString();
 				lyxerr[Debug::PARSER]
@@ -238,11 +238,11 @@ string const ToolbarBackend::getIcon(FuncRequest const & f)
 		if (!f.argument().empty())
 			xpm_name = subst(name + ' ' + to_utf8(f.argument()), ' ', '_');
 
-		fullname = libFileSearch("images", xpm_name, "xpm");
+		fullname = libFileSearch("images", xpm_name, "xpm").absFilename();
 
 		if (fullname.empty()) {
 			// try without the argument
-			fullname = libFileSearch("images", name, "xpm");
+			fullname = libFileSearch("images", name, "xpm").absFilename();
 		}
 	}
 
@@ -255,7 +255,7 @@ string const ToolbarBackend::getIcon(FuncRequest const & f)
 	lyxerr[Debug::GUI] << "Cannot find icon for command \""
 			   << lyxaction.getActionName(f.action)
 			   << '(' << to_utf8(f.argument()) << ")\"" << endl;
-	return libFileSearch("images", "unknown", "xpm");
+	return libFileSearch("images", "unknown", "xpm").absFilename();
 }