commit c8fb2bc4bd024ed94e603d252152589939ccfd14
Author: Christoph Feck <christoph@maxiom.de>
Date:   Fri Sep 30 20:16:15 2011 +0200

    Fix Ok default button state
    
    This works around a KDialog bug. The KDialog gets confused with the
    default button if it is initially disabled, so if you hit Enter, you
    effectively cancel the dialog.
    
    CCBUG: 283051

diff --git a/solid/solid-actions-kcm/SolidActions.cpp b/solid/solid-actions-kcm/SolidActions.cpp
index 2d833ab..1c24d05 100644
--- a/solid/solid-actions-kcm/SolidActions.cpp
+++ b/solid/solid-actions-kcm/SolidActions.cpp
@@ -75,9 +75,8 @@ SolidActions::SolidActions(QWidget* parent, const QVariantList&)
     addUi.setupUi( addDialog->mainWidget() );
     addDialog->setInitialSize( QSize(300, 100) ); // Set a sensible default size
 
-    slotTextChanged( addUi.LeActionName->text() );
     connect( addUi.LeActionName, SIGNAL(textChanged(QString)), this, SLOT(slotTextChanged(QString)) );
-    connect( addDialog, SIGNAL(okClicked()), this, SLOT(addAction()) );
+    connect( addDialog, SIGNAL(accepted()), this, SLOT(addAction()) );
 }
 
 SolidActions::~SolidActions()
@@ -91,6 +90,7 @@ void SolidActions::slotShowAddDialog()
    addDialog->show();
    addUi.LeActionName->setFocus();
    addUi.LeActionName->clear();
+   addDialog->enableButtonOk( false );
 }
 
 void SolidActions::slotTextChanged( const QString & text )