svn merge r578276 from trunk

svn path=/branches/work/kwin_composite/; revision=602423
This commit is contained in:
Luboš Luňák 2006-11-05 23:11:03 +00:00
parent 33fca586c5
commit a97c347fa2

View file

@ -58,7 +58,6 @@ QMenu* Workspace::clientPopup()
advanced_popup = new QMenu( popup ); advanced_popup = new QMenu( popup );
advanced_popup->setFont(KGlobalSettings::menuFont()); advanced_popup->setFont(KGlobalSettings::menuFont());
connect( advanced_popup, SIGNAL( triggered(QAction*) ), this, SLOT( clientPopupActivated(QAction*) ) );
mKeepAboveOpAction = advanced_popup->addAction( i18n("Keep &Above Others") ); mKeepAboveOpAction = advanced_popup->addAction( i18n("Keep &Above Others") );
mKeepAboveOpAction->setIcon( SmallIconSet( "up" ) ); mKeepAboveOpAction->setIcon( SmallIconSet( "up" ) );