nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix encoding of [begin] label

Browse source
This commit is contained in:
simonb 2007-08-04 18:49:55 +00:00
parent 736c43f91d
commit 0ae1f4f532
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,6 +1,9 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0.0: Changes for 1.0.0:
*07/08/05: *07/08/05:
* Fix menu heading encoding (Simon)
sf.net bug #1712583: NLS:Non-latin characters displayed incorrectly in menu title
MenuCreator.cc
* Fix error passing --with-locale path in ./configure (Simon) * Fix error passing --with-locale path in ./configure (Simon)
sf.net bug #1708859 sf.net bug #1708859
configure.in configure.in

26
src/MenuCreator.cc
View file

@ -451,16 +451,18 @@ FbTk::Menu *MenuCreator::createFromFile(const string &filename, int screen_numbe
if (!parser.isLoaded()) if (!parser.isLoaded())
return 0; return 0;
startFile();
string label; string label;
if (require_begin && !getStart(parser, label, m_stringconvertor)) if (require_begin && !getStart(parser, label, m_stringconvertor)) {
endFile();
return 0; return 0;
}
FbTk::Menu *menu = createMenu(label, screen_number); FbTk::Menu *menu = createMenu(label, screen_number);
if (menu != 0) { if (menu != 0)
startFile();
parseMenu(parser, *menu, m_stringconvertor); parseMenu(parser, *menu, m_stringconvertor);
endFile();
} endFile();
return menu; return menu;
} }
@ -474,14 +476,16 @@ bool MenuCreator::createFromFile(const string &filename,
if (!parser.isLoaded()) if (!parser.isLoaded())
return false; return false;
startFile();
string label; string label;
if (require_begin && !getStart(parser, label, m_stringconvertor)) if (require_begin && !getStart(parser, label, m_stringconvertor)) {
endFile();
return false; return false;
}
// save menu filename, so we can check if it changes // save menu filename, so we can check if it changes
Fluxbox::instance()->saveMenuFilename(real_filename.c_str()); Fluxbox::instance()->saveMenuFilename(real_filename.c_str());
startFile();
parseMenu(parser, inject_into, m_stringconvertor); parseMenu(parser, inject_into, m_stringconvertor);
endFile(); endFile();
@ -499,10 +503,12 @@ bool MenuCreator::createWindowMenuFromFile(const string &filename,
string label; string label;
if (require_begin && !getStart(parser, label, m_stringconvertor))
return false;
startFile(); startFile();
if (require_begin && !getStart(parser, label, m_stringconvertor)) {
endFile();
return false;
}
parseWindowMenu(parser, inject_into, m_stringconvertor); parseWindowMenu(parser, inject_into, m_stringconvertor);
endFile(); endFile();