From bdc324018a19aa27d81c9544415a26c57feb6f2f Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 20 Apr 2020 07:02:20 +0200 Subject: [PATCH] Fix some waylang icons. --- src/librssguard/definitions/definitions.h | 1 + src/librssguard/miscellaneous/databasequeries.cpp | 4 ++-- src/rssguard/main.cpp | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) mode change 100644 => 100755 src/librssguard/definitions/definitions.h mode change 100644 => 100755 src/librssguard/miscellaneous/databasequeries.cpp diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h old mode 100644 new mode 100755 index d31cf5848..c98553915 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -13,6 +13,7 @@ #define ARGUMENTS_LIST_SEPARATOR "\n" +#define DESKTOP_FILE_NAME "com.github.rssguard.desktop" #define LOCALHOST_ADDRESS "http://localhost" #define ADBLOCK_ADBLOCKED_PAGE "adblockedpage" #define ADBLOCK_HOWTO_FILTERS "http://adblockplus.org/en/filters" diff --git a/src/librssguard/miscellaneous/databasequeries.cpp b/src/librssguard/miscellaneous/databasequeries.cpp old mode 100644 new mode 100755 index 1a47ea171..fab9c0b2b --- a/src/librssguard/miscellaneous/databasequeries.cpp +++ b/src/librssguard/miscellaneous/databasequeries.cpp @@ -463,10 +463,10 @@ int DatabaseQueries::updateMessages(QSqlDatabase db, // Here we have query which will check for existence of the "same" message in given feed. // The two message are the "same" if: - // 1) they belong to the same feed AND, + // 1) they belong to the SAME FEED AND, // 2) they have same URL AND, // 3) they have same AUTHOR AND, - // 4) they have same title. + // 4) they have same TITLE. query_select_with_url.setForwardOnly(true); query_select_with_url.prepare("SELECT id, date_created, is_read, is_important, contents, feed FROM Messages " "WHERE feed = :feed AND title = :title AND url = :url AND author = :author AND account_id = :account_id;"); diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp index f4c53ed29..049210c56 100755 --- a/src/rssguard/main.cpp +++ b/src/rssguard/main.cpp @@ -29,6 +29,10 @@ int main(int argc, char* argv[]) { QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#if defined (Q_OS_LINUX) + QApplication::setDesktopFileName(DESKTOP_FILE_NAME); +#endif + // Ensure that ini format is used as application settings storage on Mac OS. QSettings::setDefaultFormat(QSettings::IniFormat);