From: <fon...@us...> - 2010-03-13 01:52:37
|
Revision: 5953 http://kmess.svn.sourceforge.net/kmess/?rev=5953&view=rev Author: fontknocker Date: 2010-03-13 01:52:20 +0000 (Sat, 13 Mar 2010) Log Message: ----------- Forward port r5952 from 2.0.x Modified Paths: -------------- trunk/kmess/ChangeLog trunk/kmess/src/utils/xautolock.cpp Modified: trunk/kmess/ChangeLog =================================================================== --- trunk/kmess/ChangeLog 2010-03-13 01:48:58 UTC (rev 5952) +++ trunk/kmess/ChangeLog 2010-03-13 01:52:20 UTC (rev 5953) @@ -1,3 +1,6 @@ +2010-03-13 (Adam) + * Forward port r5952 to trunk (idle-from-sleep fix). + 2010-02-20 (Adam) * When re-adding someone from the Removed list, prompt the user to unblock the contact. Modified: trunk/kmess/src/utils/xautolock.cpp =================================================================== --- trunk/kmess/src/utils/xautolock.cpp 2010-03-13 01:48:58 UTC (rev 5952) +++ trunk/kmess/src/utils/xautolock.cpp 2010-03-13 01:52:20 UTC (rev 5953) @@ -73,6 +73,11 @@ #ifdef HAVE_XSCREENSAVER int dummy; mitAvailable_ = ( XScreenSaverQueryExtension( QX11Info::display(), &dummy, &dummy ) != 0 ); + + // when the screensaver (de)activates, update idle as appropriate. + QDBusConnection::sessionBus().connect( "org.freedesktop.ScreenSaver", "/ScreenSaver", + "org.freedesktop.ScreenSaver", "ActiveChanged", + this, SLOT( checkIdle() ) ); #endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |