aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Font.cc
diff options
context:
space:
mode:
authorakir <akir>2004-10-31 23:04:30 (GMT)
committerakir <akir>2004-10-31 23:04:30 (GMT)
commitfa1692180e18f95c9e8f46d37c5bb8797eeebd5a (patch)
tree3f14d98e8b164dceff7a53778bd98970c1e39fa1 /src/FbTk/Font.cc
parent3bbb3e62442bcdf1ba7b7eea97b4dbe054146f61 (diff)
downloadfluxbox-fa1692180e18f95c9e8f46d37c5bb8797eeebd5a.zip
fluxbox-fa1692180e18f95c9e8f46d37c5bb8797eeebd5a.tar.bz2
fix #1057499
Diffstat (limited to 'src/FbTk/Font.cc')
-rw-r--r--src/FbTk/Font.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index 5bbe6de..400e197 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22//$Id: Font.cc,v 1.21 2004/09/11 22:58:20 fluxgen Exp $ 22//$Id: Font.cc,v 1.22 2004/10/31 23:04:30 akir Exp $
23 23
24 24
25#include "StringUtil.hh" 25#include "StringUtil.hh"
@@ -364,8 +364,9 @@ bool Font::load(const std::string &name) {
364 std::list< std::string > tokens; 364 std::list< std::string > tokens;
365 std::string fname; 365 std::string fname;
366 366
367 fname= std::string(name.c_str(), sep + 1); 367 fname= std::string(name.c_str(), sep);
368 FbTk::StringUtil::stringtok(tokens, name.substr(sep + 1, name.length()), ","); 368
369 FbTk::StringUtil::stringtok(tokens, name.substr(sep + 1), ",");
369 370
370 tokens.unique(); 371 tokens.unique();
371 bool firstone= true; 372 bool firstone= true;
@@ -386,7 +387,7 @@ bool Font::load(const std::string &name) {
386 fname+= ", "; 387 fname+= ", ";
387 else 388 else
388 firstone= false; 389 firstone= false;
389 fname= fname + *token; 390 fname= fname + ":" + *token;
390 } 391 }
391 } 392 }
392 393