CVS commit by orlovich: 


Let an entry in the accel conflict popup be activated with the keyboard, too, 
and not just selected. 

CCMAIL: 55139-done@bugs.kde.org


  M +4 -2      kshortcutmenu.cpp   1.2


--- kdelibs/kdecore/kshortcutmenu.cpp  #1.1:1.2
@@ -103,6 +103,8 @@ void KShortcutMenu::keyPressEvent( QKeyE
                         
                 if( iItem == -1 ) {
-                        // Let Up and Down keys navigate menu
-                        if( pEvent->key() == Qt::Key_Up || pEvent->key() == Qt::Key_Down )
+                        // Let Up and Down keys navigate menu,
+                        // And permit Enter, Return to select the item.
+                        if( pEvent->key() == Qt::Key_Up    || pEvent->key() == Qt::Key_Down ||
+                            pEvent->key() == Qt::Key_Enter || pEvent->key() == Qt::Key_Return )
                                 QPopupMenu::keyPressEvent( pEvent );
                         else