|
Line
Link Here
|
| 0 |
-- src/ui.cc |
0 |
++ src/ui.cc |
|
Lines 886-892
Link Here
|
| 886 |
unsigned i=1; |
886 |
unsigned i=1; |
| 887 |
for ( Glib::Container_Helpers::ArrayHandleIterator<Glib::Container_Helpers::TypeTraits<Glib::ustring> > iter=dirs.begin(); iter!=dirs.end(); iter++ ) { |
887 |
for ( Glib::Container_Helpers::ArrayHandleIterator<Glib::Container_Helpers::TypeTraits<Glib::ustring> > iter=dirs.begin(); iter!=dirs.end(); iter++ ) { |
| 888 |
try { |
888 |
try { |
| 889 |
Glib::Dir::Dir directory(*iter); |
889 |
Glib::Dir directory(*iter); |
| 890 |
#else |
890 |
#else |
| 891 |
boost::regex re("\\:"); |
891 |
boost::regex re("\\:"); |
| 892 |
boost::sregex_token_iterator dir(path.begin(), path.end(), re, -1); |
892 |
boost::sregex_token_iterator dir(path.begin(), path.end(), re, -1); |
|
Lines 894-900
Link Here
|
| 894 |
|
894 |
|
| 895 |
for ( unsigned i=1; dir!=end;) { |
895 |
for ( unsigned i=1; dir!=end;) { |
| 896 |
try { |
896 |
try { |
| 897 |
Glib::Dir::Dir directory(*dir++); |
897 |
Glib::Dir directory(*dir++); |
| 898 |
#endif /* GLIBMM_REGEX */ |
898 |
#endif /* GLIBMM_REGEX */ |
| 899 |
for ( Glib::DirIterator iter=directory.begin(); iter!=directory.end(); iter++ ) { |
899 |
for ( Glib::DirIterator iter=directory.begin(); iter!=directory.end(); iter++ ) { |
| 900 |
Gtk::TreeModel::Row rowCompletion = *(refCompletionModel->append()); |
900 |
Gtk::TreeModel::Row rowCompletion = *(refCompletionModel->append()); |
|
Lines 1259-1265
Link Here
|
| 1259 |
|
1259 |
|
| 1260 |
for ( std::vector<Glib::ustring>::iterator iterPath = preferences.getPathsIcons().begin(); iterPath!=preferences.getPathsIcons().end(); iterPath++ ) { |
1260 |
for ( std::vector<Glib::ustring>::iterator iterPath = preferences.getPathsIcons().begin(); iterPath!=preferences.getPathsIcons().end(); iterPath++ ) { |
| 1261 |
try { |
1261 |
try { |
| 1262 |
Glib::Dir::Dir directory(*iterPath); |
1262 |
Glib::Dir directory(*iterPath); |
| 1263 |
for ( Glib::DirIterator iter=directory.begin(); iter!=directory.end(); iter++ ) { |
1263 |
for ( Glib::DirIterator iter=directory.begin(); iter!=directory.end(); iter++ ) { |
| 1264 |
Glib::ustring icon_name = *iter; |
1264 |
Glib::ustring icon_name = *iter; |
| 1265 |
if ( icon_name.find(command_name)!=Glib::ustring::npos ) { |
1265 |
if ( icon_name.find(command_name)!=Glib::ustring::npos ) { |
