StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2601 from sudden6:cinnamon_support2

Browse Source 
sudden6 (1):
      treat x-cinnamon the same as gnome
This commit is contained in:
Zetok Zalbavar 2015-12-01 07:46:33 +00:00
commit 1b2a7cbcad
No known key found for this signature in database
GPG Key ID: C953D3880212068A
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widget/systemtrayicon.cpp
View File

@ -60,7 +60,7 @@ SystemTrayIcon::SystemTrayIcon()
} }
#endif #endif
#ifdef ENABLE_SYSTRAY_GTK_BACKEND #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"; qDebug() << "Using GTK backend";
backendType = SystrayBackendType::GTK; backendType = SystrayBackendType::GTK;

2
src/widget/widget.cpp
View File

@ -1897,7 +1897,7 @@ inline QIcon Widget::prepareIcon(QString path, uint32_t w, uint32_t h)
} }
desktop = desktop.toLower(); 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) if (w > 0 && h > 0)
{ {