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

remove unused code, better logging for systray, removed KDE5 from enum

Browse Source
This commit is contained in:
agilob 2015-10-08 19:15:37 +01:00 committed by tux3
parent 4df5c81f09
commit f2866ecc44
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widget/systemtrayicon.cpp
View File

@ -88,16 +88,16 @@ SystemTrayIcon::SystemTrayIcon()
g_signal_connect(gtkIcon, "button-release-event", G_CALLBACK(callbackButtonClick), this); g_signal_connect(gtkIcon, "button-release-event", G_CALLBACK(callbackButtonClick), this);
} }
#endif #endif
else if (desktop == "kde" && getenv("KDE_SESSION_VERSION") == QString("5")) else if (desktop == "kde" && getenv("KDE_SESSION_VERSION") == QStringLiteral("5"))
{ {
qDebug() << "Using the Qt backend"; qDebug() << "Using the Qt backend on KDE5";
qtIcon = new QSystemTrayIcon; qtIcon = new QSystemTrayIcon;
backendType = SystrayBackendType::Qt; backendType = SystrayBackendType::Qt;
connect(qtIcon, &QSystemTrayIcon::activated, this, &SystemTrayIcon::activated); connect(qtIcon, &QSystemTrayIcon::activated, this, &SystemTrayIcon::activated);
} }
else else
{ {
qDebug() << "Using the Qt backend"; qDebug() << "Using the Qt backend, because nothing else matches";
qtIcon = new QSystemTrayIcon; qtIcon = new QSystemTrayIcon;
backendType = SystrayBackendType::Qt; backendType = SystrayBackendType::Qt;
connect(qtIcon, &QSystemTrayIcon::activated, this, &SystemTrayIcon::activated); connect(qtIcon, &QSystemTrayIcon::activated, this, &SystemTrayIcon::activated);

1
src/widget/systemtrayicon_private.h
View File

@ -63,7 +63,6 @@ extern "C" {
enum class SystrayBackendType enum class SystrayBackendType
{ {
Qt, Qt,
KDE5,
#ifdef ENABLE_SYSTRAY_UNITY_BACKEND #ifdef ENABLE_SYSTRAY_UNITY_BACKEND
Unity, Unity,
#endif #endif