From 17e43d9835aab2379d013344e1ea71e27c3339f2 Mon Sep 17 00:00:00 2001 From: sudden6 Date: Sun, 29 Nov 2015 13:04:46 +0100 Subject: [PATCH] treat x-cinnamon the same as gnome --- src/widget/systemtrayicon.cpp | 2 +- src/widget/widget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/systemtrayicon.cpp b/src/widget/systemtrayicon.cpp index 69c36f1e6..86d7881b6 100644 --- a/src/widget/systemtrayicon.cpp +++ b/src/widget/systemtrayicon.cpp @@ -60,7 +60,7 @@ SystemTrayIcon::SystemTrayIcon() } #endif #ifdef ENABLE_SYSTRAY_GTK_BACKEND - else if (desktop == "xfce" || desktop.contains("gnome") || desktop == "mate") + else if (desktop == "xfce" || desktop.contains("gnome") || desktop == "mate" || desktop == "x-cinnamon") { qDebug() << "Using GTK backend"; backendType = SystrayBackendType::GTK; diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 5b568f404..d05b17971 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -1897,7 +1897,7 @@ inline QIcon Widget::prepareIcon(QString path, uint32_t w, uint32_t h) } desktop = desktop.toLower(); - if (desktop == "xfce" || desktop.contains("gnome") || desktop == "mate") + if (desktop == "xfce" || desktop.contains("gnome") || desktop == "mate" || desktop == "x-cinnamon") { if (w > 0 && h > 0) {