diff -Nru albert-0.9.2/CMakeLists.txt albert-0.9.3/CMakeLists.txt --- albert-0.9.2/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) project(albertlauncher) diff -Nru albert-0.9.2/debian/changelog albert-0.9.3/debian/changelog --- albert-0.9.2/debian/changelog 2017-01-31 10:39:29.000000000 +0000 +++ albert-0.9.3/debian/changelog 2017-02-06 14:31:29.000000000 +0000 @@ -1,3 +1,9 @@ +albert (0.9.3-1~webupd8~trusty0) trusty; urgency=medium + + * New upstream bugfix release + + -- Alin Andrei Mon, 06 Feb 2017 16:31:29 +0200 + albert (0.9.2-1~webupd8~trusty0) trusty; urgency=medium * New upstream bugfix release diff -Nru albert-0.9.2/src/application/CMakeLists.txt albert-0.9.3/src/application/CMakeLists.txt --- albert-0.9.2/src/application/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/application/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) project(albert) diff -Nru albert-0.9.2/src/application/src/main.cpp albert-0.9.3/src/application/src/main.cpp --- albert-0.9.2/src/application/src/main.cpp 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/application/src/main.cpp 2017-02-05 15:37:10.000000000 +0000 @@ -66,7 +66,7 @@ app = new QApplication(argc, argv); app->setApplicationName("albert"); app->setApplicationDisplayName("Albert"); - app->setApplicationVersion("v0.9.2"); + app->setApplicationVersion("v0.9.3"); app->setQuitOnLastWindowClosed(false); QString icon = XdgIconLookup::iconPath("albert"); if ( icon.isEmpty() ) icon = ":app_icon"; diff -Nru albert-0.9.2/src/lib/albert/CMakeLists.txt albert-0.9.3/src/lib/albert/CMakeLists.txt --- albert-0.9.2/src/lib/albert/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/lib/albert/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) project(albertcore) diff -Nru albert-0.9.2/src/lib/albert/src/offlineindex/fuzzysearch.cpp albert-0.9.3/src/lib/albert/src/offlineindex/fuzzysearch.cpp --- albert-0.9.2/src/lib/albert/src/offlineindex/fuzzysearch.cpp 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/lib/albert/src/offlineindex/fuzzysearch.cpp 2017-02-05 15:37:10.000000000 +0000 @@ -71,7 +71,8 @@ /** ***************************************************************************/ -Core::FuzzySearch::FuzzySearch(const Core::PrefixSearch &rhs, uint q, double d) : PrefixSearch(rhs), q_(q), delta_(d) { +Core::FuzzySearch::FuzzySearch(const Core::PrefixSearch &rhs, uint q, double d) + : PrefixSearch(rhs), q_(q), delta_(d) { // Iterate over the inverted index and build the qGramindex for ( const std::pair> &invertedIndexEntry : invertedIndex_ ) { QString spaced = QString(q_-1,' ').append(invertedIndexEntry.first); diff -Nru albert-0.9.2/src/lib/albert/src/offlineindex/prefixsearch.cpp albert-0.9.3/src/lib/albert/src/offlineindex/prefixsearch.cpp --- albert-0.9.2/src/lib/albert/src/offlineindex/prefixsearch.cpp 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/lib/albert/src/offlineindex/prefixsearch.cpp 2017-02-05 15:37:10.000000000 +0000 @@ -35,6 +35,7 @@ /** ***************************************************************************/ Core::PrefixSearch::PrefixSearch(const Core::PrefixSearch &rhs) { + index_ = rhs.index_; invertedIndex_ = rhs.invertedIndex_; } diff -Nru albert-0.9.2/src/lib/albert/src/pluginsystem/extensionspec.cpp albert-0.9.3/src/lib/albert/src/pluginsystem/extensionspec.cpp --- albert-0.9.2/src/lib/albert/src/pluginsystem/extensionspec.cpp 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/lib/albert/src/pluginsystem/extensionspec.cpp 2017-02-05 15:37:10.000000000 +0000 @@ -54,7 +54,7 @@ * have to be deleted. This is a lot of work an nobody cares about that * little amount of extra KBs in RAM until next restart. */ - instance()->deleteLater(); + delete instance(); state_ = State::NotLoaded; return true; diff -Nru albert-0.9.2/src/lib/globalshortcut/CMakeLists.txt albert-0.9.3/src/lib/globalshortcut/CMakeLists.txt --- albert-0.9.2/src/lib/globalshortcut/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/lib/globalshortcut/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) project(globalshortcut) diff -Nru albert-0.9.2/src/lib/xdg/CMakeLists.txt albert-0.9.3/src/lib/xdg/CMakeLists.txt --- albert-0.9.2/src/lib/xdg/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/lib/xdg/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) project(xdg) add_definitions(-DXDG) #export branch diff -Nru albert-0.9.2/src/plugins/applications/CMakeLists.txt albert-0.9.3/src/plugins/applications/CMakeLists.txt --- albert-0.9.2/src/plugins/applications/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/applications/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(applications) diff -Nru albert-0.9.2/src/plugins/calculator/CMakeLists.txt albert-0.9.3/src/plugins/calculator/CMakeLists.txt --- albert-0.9.2/src/plugins/calculator/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/calculator/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(calculator) diff -Nru albert-0.9.2/src/plugins/chromebookmarks/CMakeLists.txt albert-0.9.3/src/plugins/chromebookmarks/CMakeLists.txt --- albert-0.9.2/src/plugins/chromebookmarks/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/chromebookmarks/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(chromebookmarks) diff -Nru albert-0.9.2/src/plugins/debug/CMakeLists.txt albert-0.9.3/src/plugins/debug/CMakeLists.txt --- albert-0.9.2/src/plugins/debug/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/debug/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(debug) diff -Nru albert-0.9.2/src/plugins/externalextensions/CMakeLists.txt albert-0.9.3/src/plugins/externalextensions/CMakeLists.txt --- albert-0.9.2/src/plugins/externalextensions/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/externalextensions/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(externalextensions) diff -Nru albert-0.9.2/src/plugins/files/CMakeLists.txt albert-0.9.3/src/plugins/files/CMakeLists.txt --- albert-0.9.2/src/plugins/files/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/files/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(files) diff -Nru albert-0.9.2/src/plugins/files/src/main.cpp albert-0.9.3/src/plugins/files/src/main.cpp --- albert-0.9.2/src/plugins/files/src/main.cpp 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/files/src/main.cpp 2017-02-05 15:37:10.000000000 +0000 @@ -139,28 +139,27 @@ /** ***************************************************************************/ void Files::FilesPrivate::finishIndexing() { + // In case of abortion the returned data is invalid + if ( !abort ) { + // Get the thread results + index = futureWatcher.future().result(); + + // Rebuild the offline index + offlineIndex.clear(); + for (const auto &item : index) + offlineIndex.add(item); + + // Notification + qDebug() << qPrintable(QString("[%1] Indexing done (%2 items).").arg(q->Core::Extension::id).arg(index.size())); + emit q->statusInfo(QString("%1 files indexed.").arg(index.size())); + } + + abort = false; + if ( rerun ) { rerun = false; startIndexing(); } - - // In case of abortion the returned data is invalid, quit - if ( abort ) { - abort = false; - return; - } - - // Get the thread results - index = futureWatcher.future().result(); - - // Rebuild the offline index - offlineIndex.clear(); - for (const auto &item : index) - offlineIndex.add(item); - - // Notification - qDebug() << qPrintable(QString("[%1] Indexing done (%2 items).").arg(q->Core::Extension::id).arg(index.size())); - emit q->statusInfo(QString("%1 files indexed.").arg(index.size())); } diff -Nru albert-0.9.2/src/plugins/firefoxbookmarks/CMakeLists.txt albert-0.9.3/src/plugins/firefoxbookmarks/CMakeLists.txt --- albert-0.9.2/src/plugins/firefoxbookmarks/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/firefoxbookmarks/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(firefoxbookmarks) diff -Nru albert-0.9.2/src/plugins/system/CMakeLists.txt albert-0.9.3/src/plugins/system/CMakeLists.txt --- albert-0.9.2/src/plugins/system/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/system/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(system) diff -Nru albert-0.9.2/src/plugins/system/src/main.cpp albert-0.9.3/src/plugins/system/src/main.cpp --- albert-0.9.2/src/plugins/system/src/main.cpp 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/system/src/main.cpp 2017-02-05 15:37:10.000000000 +0000 @@ -91,7 +91,7 @@ else if (de == "kde-plasma") return "qdbus org.kde.ksmserver /KSMServer logout 0 0 0"; else if (de == "X-Cinnamon") - return "cinnamon-session-quit --logout --no-prompt"; + return "cinnamon-session-quit --logout"; else if (de == "XFCE") return "xfce4-session-logout --logout"; else if (de == "MATE") @@ -131,11 +131,11 @@ case POWEROFF: if (de == "Unity" || de == "Pantheon" || de == "Gnome") - return "gnome-session-quit --power-off --no-prompt"; + return "gnome-session-quit --power-off"; else if (de == "kde-plasma") return "qdbus org.kde.ksmserver /KSMServer logout 0 2 0"; else if (de == "X-Cinnamon") - return "cinnamon-session-quit --power-off --no-prompt"; + return "cinnamon-session-quit --power-off"; else if (de == "XFCE") return "xfce4-session-logout --halt"; else if (de == "MATE") diff -Nru albert-0.9.2/src/plugins/templateExtension/CMakeLists.txt albert-0.9.3/src/plugins/templateExtension/CMakeLists.txt --- albert-0.9.2/src/plugins/templateExtension/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/templateExtension/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(template) diff -Nru albert-0.9.2/src/plugins/terminal/CMakeLists.txt albert-0.9.3/src/plugins/terminal/CMakeLists.txt --- albert-0.9.2/src/plugins/terminal/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/terminal/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(terminal) diff -Nru albert-0.9.2/src/plugins/virtualbox/CMakeLists.txt albert-0.9.3/src/plugins/virtualbox/CMakeLists.txt --- albert-0.9.2/src/plugins/virtualbox/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/virtualbox/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(virtualbox) diff -Nru albert-0.9.2/src/plugins/websearch/CMakeLists.txt albert-0.9.3/src/plugins/websearch/CMakeLists.txt --- albert-0.9.2/src/plugins/websearch/CMakeLists.txt 2017-01-30 15:41:49.000000000 +0000 +++ albert-0.9.3/src/plugins/websearch/CMakeLists.txt 2017-02-05 15:37:10.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11) +cmake_minimum_required(VERSION 2.8.12) PROJECT(websearch)