fix bug 2089: Touching Navigate menu crashes Lyx when a TOC inset is in a section...

[lyx.git] / src / ToolbarBackend.C

diff --git a/src/ToolbarBackend.C b/src/ToolbarBackend.C
index 647586b1f77724930a47788b05fe5e6280364be5..baa2ddfbcdfaf57865410b8aaaf1f53a02978fb4 100644 (file)
--- a/src/ToolbarBackend.C
+++ b/src/ToolbarBackend.C
@@ -155,7 +155,7 @@ void ToolbarBackend::readToolbars(LyXLex & lex)
                Toolbars::iterator tcit = toolbars.begin();
                Toolbars::iterator tend = toolbars.end();
                for (; tcit != tend; ++tcit) {
-                       if (compare_ascii_no_case(name, tcit->name) == 0)
+                       if (tcit->name == name)
                                break;
                }
 
@@ -207,11 +207,14 @@ void ToolbarBackend::add(Toolbar & tb,
                         FuncRequest const & func, string const & tooltip)
 {
        tb.items.push_back(make_pair(func, tooltip));
+       tb.items.back().first.origin = FuncRequest::UI;
 }
 
 
 string const ToolbarBackend::getIcon(FuncRequest const & f)
 {
+       using lyx::frontend::find_xpm;
+
        string fullname;
 
        if (f.action == LFUN_INSERT_MATH) {