diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/adblock/adblockhostmatcher.cpp | 12 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkowner.cpp | 4 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkprovider.cpp | 1 | ||||
| -rw-r--r-- | src/data/rekonq.desktop | 1 | ||||
| -rw-r--r-- | src/search/opensearchmanager.cpp | 1 |
6 files changed, 12 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c3a7db61..b0ae8185 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ PROJECT( rekonq ) # Informations to update before to release this package. # rekonq info -SET(REKONQ_VERSION "0.5.86" ) +SET(REKONQ_VERSION "0.5.87" ) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h ) diff --git a/src/adblock/adblockhostmatcher.cpp b/src/adblock/adblockhostmatcher.cpp index b11dab2c..75387974 100644 --- a/src/adblock/adblockhostmatcher.cpp +++ b/src/adblock/adblockhostmatcher.cpp @@ -32,18 +32,18 @@ bool AdBlockHostMatcher::tryAddFilter(const QString &filter) { if (filter.startsWith(QL1S("||"))) { + QString domain = filter.mid(2); - const int indexOfFirstSeparator = domain.indexOf(QL1C('^')); - if (indexOfFirstSeparator < 0) + if (!domain.endsWith(QL1C('^'))) return false; - const int indexOfLastDollar = domain.lastIndexOf(QL1C('$')); - if (indexOfLastDollar >= 0 && indexOfLastDollar != indexOfFirstSeparator + 1) + if (domain.contains(QL1C('$'))) return false; - domain = domain.left(indexOfFirstSeparator); - if (domain.contains(QL1C('/')) || domain.contains(QL1C('*'))) + domain = domain.left(domain.size() - 1); + + if (domain.contains(QL1C('/')) || domain.contains(QL1C('*')) || domain.contains(QL1C('^'))) return false; domain = domain.toLower(); diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp index f9e64d68..8a05d646 100644 --- a/src/bookmarks/bookmarkowner.cpp +++ b/src/bookmarks/bookmarkowner.cpp @@ -167,7 +167,9 @@ void BookmarkOwner::openBookmarkFolder(const KBookmark &bookmark) { if (KMessageBox::warningContinueCancel( Application::instance()->mainWindow(), - i18n("You are about to open %1 tabs.\nAre you sure?", urlList.length())) + i18ncp("%1=Number of tabs. Value is always >=8", + "You are about to open %1 tabs.\nAre you sure?", + "You are about to open %1 tabs.\nAre you sure?", urlList.length())) != KMessageBox::Continue ) return; diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp index 8089fb6d..7cd48825 100644 --- a/src/bookmarks/bookmarkprovider.cpp +++ b/src/bookmarks/bookmarkprovider.cpp @@ -78,6 +78,7 @@ BookmarkProvider::BookmarkProvider(QObject *parent) } m_manager = KBookmarkManager::managerForFile(bookfile.path(), "rekonq"); + m_manager->setEditorOptions("", true); connect(m_manager, SIGNAL(changed(const QString &, const QString &)), this, SLOT(slotBookmarksChanged())); diff --git a/src/data/rekonq.desktop b/src/data/rekonq.desktop index c783e5b9..2f17ad99 100644 --- a/src/data/rekonq.desktop +++ b/src/data/rekonq.desktop @@ -36,6 +36,7 @@ GenericName[de]=Webbrowser GenericName[el]=Περιηγητής ιστού GenericName[en_GB]=Web Browser GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja GenericName[fr]=Navigateur web GenericName[it]=Browser Web GenericName[nds]=Nettkieker diff --git a/src/search/opensearchmanager.cpp b/src/search/opensearchmanager.cpp index c2ac1ddb..32b0b36f 100644 --- a/src/search/opensearchmanager.cpp +++ b/src/search/opensearchmanager.cpp @@ -151,7 +151,6 @@ void OpenSearchManager::requestSuggestion(const QString &searchText) { disconnect(m_currentJob); m_currentJob->kill(); - delete m_currentJob; } m_jobData.clear(); |