From 886b3a77a64d5808d2fe68d0e7e6b712cf642753 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Fri, 24 Jun 2005 12:10:13 +0000
Subject: - fix configdialog checking for productIdentity, not for cardmgr's idea of that

- perform insert action and perform suspend action
Except for "prompt for" and some polishing, this applet should now be fairly complete
---
(limited to 'noncore/applets/pcmcia/configdialog.cpp')

diff --git a/noncore/applets/pcmcia/configdialog.cpp b/noncore/applets/pcmcia/configdialog.cpp
index f5812ba..f94edde 100644
--- a/noncore/applets/pcmcia/configdialog.cpp
+++ b/noncore/applets/pcmcia/configdialog.cpp
@@ -132,6 +132,7 @@ void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& k
     OConfig cfg( "PCMCIA" );
     cfg.setGroup( "Global" );
     int nCards = cfg.readNumEntry( "nCards", 0 );
+    QString cardName = card->productIdentity().join( " " ).stripWhiteSpace();
     QString action;
 
     for ( int i = 0; i < nCards; ++i )
@@ -139,8 +140,8 @@ void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& k
         QString cardSection = QString( "Card_%1" ).arg( i );
         cfg.setGroup( cardSection );
         QString name = cfg.readEntry( "name" );
-        odebug << "comparing card '" << card->name() << "' with known card '" << name << "'" << oendl;
-        if ( card->name() == name )
+        odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
+        if ( cardName == name )
         {
             cfg.writeEntry( key, value );
             break;
@@ -153,6 +154,7 @@ QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString&
     OConfig cfg( "PCMCIA" );
     cfg.setGroup( "Global" );
     int nCards = cfg.readNumEntry( "nCards", 0 );
+    QString cardName = card->productIdentity().join( " " ).stripWhiteSpace();
     QString value;
 
     for ( int i = 0; i < nCards; ++i )
@@ -160,8 +162,8 @@ QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString&
         QString cardSection = QString( "Card_%1" ).arg( i );
         cfg.setGroup( cardSection );
         QString name = cfg.readEntry( "name" );
-        odebug << "comparing card '" << card->name() << "' with known card '" << name << "'" << oendl;
-        if ( card->name() == name )
+        odebug << "comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
+        if ( cardName == name )
         {
             value = cfg.readEntry( key, defaultValue );
             break;
--
cgit v0.9.0.2