From 1789ef545e09121b7f1fac9e751e176275b2e7ce Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 26 Jun 2009 15:09:07 +0000 Subject: [PATCH] * Makefile.am (setup_LDADD): Add -lshlwapi. * PickView.cc: Include shlwapi.h. (PickView::setViewMode): Compare package name with search string case-insensitive. (PickView::insert_category): Ditto. --- ChangeLog | 8 ++++++++ Makefile.am | 2 +- PickView.cc | 6 ++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9b6b8ca..891878cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-06-26 Corinna Vinschen + + * Makefile.am (setup_LDADD): Add -lshlwapi. + * PickView.cc: Include shlwapi.h. + (PickView::setViewMode): Compare package name with search string + case-insensitive. + (PickView::insert_category): Ditto. + 2009-06-26 Corinna Vinschen * script.cc (init_run_script): Don't set $HOME to /tmp. It breaks diff --git a/Makefile.am b/Makefile.am index d6f23962..3bca1c36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,7 +119,7 @@ libinilex_a_CXXFLAGS = $(BASECXXFLAGS) setup_LDADD = \ libinilex.a \ -Linst/lib -lgetopt++ -lgcrypt -lgpg-error \ - -lcomctl32 -lole32 -lwsock32 -lnetapi32 -luuid -lbz2 -lz + -lshlwapi -lcomctl32 -lole32 -lwsock32 -lnetapi32 -luuid -lbz2 -lz setup_LDFLAGS = -mwindows -Wl,-static setup_SOURCES = \ AntiVirus.cc \ diff --git a/PickView.cc b/PickView.cc index ac28173c..f7d0aaec 100644 --- a/PickView.cc +++ b/PickView.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include "PickPackageLine.h" #include "PickCategoryLine.h" #include "package_db.h" @@ -194,7 +195,7 @@ PickView::setViewMode (views mode) { // Filter by package name if (packageFilterString.empty () - || pkg.name.find (packageFilterString) != std::string::npos) + || StrStrI (pkg.name.c_str (), packageFilterString.c_str ())) insert_pkg (pkg); } } @@ -318,7 +319,8 @@ PickView::insert_category (Category *cat, bool collapsed) i != cat->second.end () ; ++i) { if (packageFilterString.empty () \ - || (*i && (*i)->name.find (packageFilterString) != std::string::npos)) + || (*i + && StrStrI ((*i)->name.c_str (), packageFilterString.c_str ()))) { PickLine & line = *new PickPackageLine (*this, **i); catline.insert (line); -- 2.43.5