1 files changed, 85 insertions, 26 deletions

diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
index 3b1b40c..010d691 100644
--- a/noncore/applets/pcmcia/configdialog.cpp
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -24,57 +24,62 @@
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "configdialog.h"
 
 /* OPIE */
 #include <opie2/oconfig.h>
 #include <opie2/odebug.h>
 #include <opie2/opcmciasystem.h>
+#include <qpe/global.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qcombobox.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qtextstream.h>
 
+/* STD */
+#include <errno.h>
+#include <string.h>
+
 ConfigDialog::ConfigDialog( const OPcmciaSocket* card, QWidget* parent )
              :ConfigDialogBase( parent, "pcmcia config dialog", true )
 {
     gbDetails->setTitle( QString( "Details for card in socket #%1" ).arg( card->number() ) );
     txtCardName->setText( card->productIdentity() );
     txtManfid->setText( card->manufacturerIdentity() );
     txtFunction->setText( card->function() );
 
     QString insertAction = preferredAction( card, "insert" );
     QString resumeAction = preferredAction( card, "resume" );
 
     odebug << "pcmcia: preferred insertion action for card '" << card->productIdentity() << "' seems to be '" << insertAction << "'" << oendl;
     odebug << "pcmcia: preferred resume    action for card '" << card->productIdentity() << "' seems to be '" << resumeAction << "'" << oendl;
 
     if ( !insertAction.isEmpty() )
     {
-        for ( int i; i < cbInsertAction->count(); ++i )
+        for ( unsigned int i = 0; i < cbInsertAction->count(); ++i )
             if ( cbInsertAction->text( i ) == insertAction ) cbInsertAction->setCurrentItem( i );
     }
 
     if ( !resumeAction.isEmpty() )
     {
-        for ( int i; i < cbResumeAction->count(); ++i )
+        for ( unsigned int i = 0; i < cbResumeAction->count(); ++i )
             if ( cbResumeAction->text( i ) == resumeAction ) cbResumeAction->setCurrentItem( i );
     }
 
     if ( !card->isUnsupported() )
     {
         odebug << "pcmcia: card is recognized - hiding bindings" << oendl;
         textInfo->hide();
         textBindTo->hide();
         cbBindTo->hide();
         return;
     }
     else
@@ -120,60 +125,114 @@ ConfigDialog::ConfigDialog( const OPcmciaSocket* card, QWidget* parent )
     {
         odebug << "found binding '" << it.key() << "' defined in '" << it.data().latin1() << "'" << oendl;
         cbBindTo->insertItem( it.key() );
     }
 }
 
 ConfigDialog::~ConfigDialog()
 {
 }
 
 void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& key, const QString& value )
 {
-    OConfig cfg( "PCMCIA" );
-    cfg.setGroup( "Global" );
-    int nCards = cfg.readNumEntry( "nCards", 0 );
-    QString cardName = card->productIdentity();
-    QString action;
+    OConfig* cfg = cardConfig( card );
+    if ( cfg )
+    {
+        cfg->writeEntry( key, value );
+    }
+    delete cfg; // deleting a 0 pointer is within spec.
+}
 
-    for ( int i = 0; i < nCards; ++i )
+QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString& key, const QString& defaultValue )
     {
-        QString cardSection = QString( "Card_%1" ).arg( i );
-        cfg.setGroup( cardSection );
-        QString name = cfg.readEntry( "name" );
-        odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
-        if ( cardName == name )
+    QString value;
+    OConfig* cfg = cardConfig( card );
+    if ( cfg )
         {
-            cfg.writeEntry( key, value );
-            break;
+        value = cfg->readEntry( key, defaultValue );
         }
+    delete cfg; // deleting a 0 pointer is within spec.
+    return value;
     }
+
+
+QString ConfigDialog::preferredAction( const OPcmciaSocket* card, const QString& type )
+{
+    return ConfigDialog::readConfigEntry( card, QString( "%1Action" ).arg( type ), "suspend" );
 }
 
-QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString& key, const QString& defaultValue )
+
+OConfig* ConfigDialog::cardConfig( const OPcmciaSocket* card )
 {
-    OConfig cfg( "PCMCIA" );
-    cfg.setGroup( "Global" );
-    int nCards = cfg.readNumEntry( "nCards", 0 );
+    OConfig* cardcfg = 0;
+    OConfig* cfg = new OConfig( "PCMCIA" );
+    cfg->setGroup( "Global" );
+    int nCards = cfg->readNumEntry( "nCards", 0 );
     QString cardName = card->productIdentity();
-    QString value;
 
     for ( int i = 0; i < nCards; ++i )
     {
         QString cardSection = QString( "Card_%1" ).arg( i );
-        cfg.setGroup( cardSection );
-        QString name = cfg.readEntry( "name" );
+        cfg->setGroup( cardSection );
+        QString name = cfg->readEntry( "name" );
         odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
         if ( cardName == name )
         {
-            value = cfg.readEntry( key, defaultValue );
+            cardcfg = cfg;
             break;
         }
     }
-    return value;
+    return cardcfg;
 }
 
 
-QString ConfigDialog::preferredAction( const OPcmciaSocket* card, const QString& type )
+void ConfigDialog::writeConfiguration( const OPcmciaSocket* card )
 {
-    return ConfigDialog::readConfigEntry( card, QString( "%1Action" ).arg( type ), "suspend" );
+    odebug << "pcmcia: ConfigDialog::writeConfiguration()" << oendl;
+    OConfig* cfg = cardConfig( card );
+    if ( !cfg )
+    {
+        cfg = new OConfig( "PCMCIA" );
+        cfg->setGroup( "Global" );
+        int nCards = cfg->readNumEntry( "nCards", 0 );
+        cfg->setGroup( QString( "Card_%1" ).arg( nCards ) );
+        cfg->writeEntry( "name", card->productIdentity() );
+        cfg->setGroup( "Global" );
+        cfg->writeEntry( "nCards", nCards+1 );
+        cfg->setGroup( QString( "Card_%1" ).arg( nCards ) );
+    }
+
+    cfg->writeEntry( "insertAction", cbInsertAction->currentText() );
+    cfg->writeEntry( "resumeAction", cbResumeAction->currentText() );
+    cfg->write();
+
+    if ( cbBindTo->isVisible() && cbBindTo->currentText() != "<None>" )
+    {
+        QString driver = cbBindTo->currentText();
+        QString conf = bindEntries[driver];
+
+        // write binding
+
+        QFile confFile( conf );
+        if ( confFile.open( IO_ReadWrite | IO_Append ) )
+        {
+            QString entryCard = QString( "card \"%1\"" ).arg( card->productIdentity() );
+            QString entryVersion( "    version " );
+            for ( QStringList::Iterator it = card->productIdentityVector().begin(); it != card->productIdentityVector().end(); ++it )
+            {
+                entryVersion += QString( "\"%1\", " ).arg( *it );
+            }
+            QString entryBind = QString( "    bind %1" ).arg( driver );
+            QString entry = QString( "\n%1\n%2\n%3\n" ).arg( entryCard ).arg( entryVersion ).arg( entryBind );
+            odebug << "pcmcia: writing entry...:" << entry << oendl;
+
+            confFile.writeBlock( (const char*) entry, entry.length() );
+            Global::statusMessage( "restarting pcmcia services..." );
+            OPcmciaSystem::instance()->restart();
+        }
+        else
+        {
+            owarn << "pcmcia: couldn't write binding to '" << conf << "' ( " << strerror( errno ) << " )." << oendl;
+        }
 }
+}
+