Keep BC.
svn path=/trunk/kdebase/kwin/; revision=175540
This commit is contained in:
parent
e3dddfb21d
commit
427941efea
2 changed files with 3 additions and 3 deletions
|
@ -1411,7 +1411,7 @@ void Workspace::setActiveClient( Client* c )
|
||||||
{
|
{
|
||||||
if ( active_client == c )
|
if ( active_client == c )
|
||||||
return;
|
return;
|
||||||
if( popup && popup_client != c ) {
|
if( popup && static_cast< Client* >( popup_client ) != c ) {
|
||||||
popup->close();
|
popup->close();
|
||||||
popup_client = 0;
|
popup_client = 0;
|
||||||
}
|
}
|
||||||
|
@ -1781,7 +1781,7 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op )
|
||||||
|
|
||||||
void Workspace::clientPopupActivated( int id )
|
void Workspace::clientPopupActivated( int id )
|
||||||
{
|
{
|
||||||
performWindowOperation( popup_client ? popup_client : active_client, (Options::WindowOperation) id );
|
performWindowOperation( popup_client ? static_cast< Client* >( popup_client ) : active_client, (Options::WindowOperation) id );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|
|
@ -395,7 +395,7 @@ private:
|
||||||
int number_of_desktops;
|
int number_of_desktops;
|
||||||
QMemArray<int> desktop_focus_chain;
|
QMemArray<int> desktop_focus_chain;
|
||||||
|
|
||||||
Client* popup_client;
|
QGuardedPtr<Client> popup_client;
|
||||||
|
|
||||||
void loadSessionInfo();
|
void loadSessionInfo();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue