-diff --git a/Charm/Idle/X11IdleDetector.cpp b/Charm/Idle/X11IdleDetector.cpp -index 4f03a418..796742a3 100644 ---- Charm/Idle/X11IdleDetector.cpp -+++ Charm/Idle/X11IdleDetector.cpp -@@ -32,18 +32,20 @@ - X11IdleDetector::X11IdleDetector(QObject *parent) - : IdleDetector(parent) - { -+ setAvailable(false); -+ m_connection = xcb_connect(NULL, NULL); // krazy:exclude=null -+ m_screen = xcb_setup_roots_iterator(xcb_get_setup(m_connection)).data; -+ if (!m_screen) -+ return; -+ auto query = xcb_get_extension_data(m_connection, &xcb_screensaver_id); -+ Q_ASSERT(query); -+ if (!query->present) -+ return; -+ - connect(&m_timer, &QTimer::timeout, this, &X11IdleDetector::checkIdleness); - m_timer.start(idlenessDuration() * 1000 / 5); - m_heartbeat = QDateTime::currentDateTime(); --} -- --bool X11IdleDetector::idleCheckPossible() --{ -- m_connection = xcb_connect(NULL, NULL); //krazy:exclude=null -- m_screen = xcb_setup_roots_iterator(xcb_get_setup(m_connection)).data; -- if (m_screen) -- return true; -- return false; -+ setAvailable(true); - } - - void X11IdleDetector::onIdlenessDurationChanged() -diff --git a/Charm/Idle/X11IdleDetector.h b/Charm/Idle/X11IdleDetector.h -index 0b0f48ca..45ef9328 100644 ---- Charm/Idle/X11IdleDetector.h -+++ Charm/Idle/X11IdleDetector.h -@@ -38,7 +38,6 @@ class X11IdleDetector : public IdleDetector - Q_OBJECT - public: - explicit X11IdleDetector(QObject *parent); -- bool idleCheckPossible(); - - protected: - void onIdlenessDurationChanged() override; -@@ -50,8 +49,8 @@ private Q_SLOTS: - QDateTime m_heartbeat; - QTimer m_timer; - #if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) -- xcb_connection_t *m_connection; -- xcb_screen_t *m_screen; -+ xcb_connection_t *m_connection = nullptr; -+ xcb_screen_t *m_screen = nullptr; - #endif - }; - diff --git a/deskutils/charmtimetracker/pkg-descr b/deskutils/charmtimetracker/pkg-descr deleted file mode 100644 index 80232fc65fc2..000000000000 --- a/deskutils/charmtimetracker/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Charm is a program for FreeBSD, OS X, Linux and Windows that helps to keep -track of time. It is built around two major ideas - tasks and events. Tasks -are the things time is spend on, repeatedly. For example, ironing -laundry is a task. The laundry done for two hours on last Tuesday is an -event in that task. When doing laundry multiple times, the events will -be accumulated, and can later be printed in activity reports or weekly -time sheets. So in case laundry would be done for three hours on -Wednesday again, the activity report for the "Ironing Laundry" task -would list the event on tuesday, the event on wednesday and a total of -five hours. diff --git a/deskutils/charmtimetracker/pkg-plist b/deskutils/charmtimetracker/pkg-plist deleted file mode 100644 index 7e287fcf6f0e..000000000000 --- a/deskutils/charmtimetracker/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/charmtimetracker -share/applications/charmtimetracker.desktop -share/doc/HTML/charmtimetracker/ReadMe.md -share/icons/hicolor/128x128/apps/Charm.png -share/icons/hicolor/16x16/apps/Charm.png -share/icons/hicolor/256x256/apps/Charm.png -share/icons/hicolor/32x32/apps/Charm.png -share/icons/hicolor/48x48/apps/Charm.png -share/icons/hicolor/64x64/apps/Charm.png