Avoid the warning when it's the same client activated twice using
the same timestamp (e.g. when clicking on the kgpg systray icon). svn path=/trunk/kdebase/kwin/; revision=279888
This commit is contained in:
parent
6056e22fe6
commit
0a65d69e80
1 changed files with 3 additions and 1 deletions
|
@ -1100,12 +1100,14 @@ void Client::takeFocus( bool force, allowed_t )
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
static Time previous_focus_timestamp;
|
static Time previous_focus_timestamp;
|
||||||
if( previous_focus_timestamp == qt_x_time )
|
static Client* previous_client;
|
||||||
|
if( previous_focus_timestamp == qt_x_time && previous_client != this )
|
||||||
{
|
{
|
||||||
kdWarning( 1212 ) << "Repeated use of the same X timestamp for focus" << endl;
|
kdWarning( 1212 ) << "Repeated use of the same X timestamp for focus" << endl;
|
||||||
kdDebug( 1212 ) << kdBacktrace() << endl;
|
kdDebug( 1212 ) << kdBacktrace() << endl;
|
||||||
}
|
}
|
||||||
previous_focus_timestamp = qt_x_time;
|
previous_focus_timestamp = qt_x_time;
|
||||||
|
previous_client = this;
|
||||||
#endif
|
#endif
|
||||||
if ( input )
|
if ( input )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue