| author | mickeyl <mickeyl> | 2005-06-24 12:10:13 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2005-06-24 12:10:13 (UTC) |
| commit | 886b3a77a64d5808d2fe68d0e7e6b712cf642753 (patch) (side-by-side diff) | |
| tree | 60121b38e6100ff10a6e01293b7e478489f09bba /noncore/applets/pcmcia/configdialog.cpp | |
| parent | 4775588885d60ea208c667a5863244a847a69f94 (diff) | |
| download | opie-886b3a77a64d5808d2fe68d0e7e6b712cf642753.zip opie-886b3a77a64d5808d2fe68d0e7e6b712cf642753.tar.gz opie-886b3a77a64d5808d2fe68d0e7e6b712cf642753.tar.bz2 | |
- 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
Diffstat (limited to 'noncore/applets/pcmcia/configdialog.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/applets/pcmcia/configdialog.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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 @@ -134,2 +134,3 @@ void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& k int nCards = cfg.readNumEntry( "nCards", 0 ); + QString cardName = card->productIdentity().join( " " ).stripWhiteSpace(); QString action; @@ -141,4 +142,4 @@ void ConfigDialog::writeConfigEntry( const OPcmciaSocket* card, const QString& k 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 ) { @@ -155,2 +156,3 @@ QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString& int nCards = cfg.readNumEntry( "nCards", 0 ); + QString cardName = card->productIdentity().join( " " ).stripWhiteSpace(); QString value; @@ -162,4 +164,4 @@ QString ConfigDialog::readConfigEntry( const OPcmciaSocket* card, const QString& 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 ) { |