← Back to branch summary

~ubuntu-branches/ubuntu/lucid/knetworkmanager/lucid

« back to all changes in this revision

Viewing changes to knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2009-09-02 00:32:01 UTC
  • mfrom: (1.2.8 upstream) (1.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20090902003201-q1v8drzx8eq3q9h2
Tags: 1:0.7~~svn941706-2
http://bugs.debian.org/543026
* Bump Standards-Version to 3.8.3. No further changes.
* debian/patches/06-buildsystem_fixes.patch
  - Add support for automake 1.11.
  - Fix build failures with autoconf 2.64 where the compiler is not
    correctly detected as GNU compiler leading to libtool not linking
    libraries correctly. Closes: #543026

Show diffs side-by-side

added added

removed removed

Lines of Context:
knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp
90
90
                Wireless* wireless = dynamic_cast<Wireless*>(conn->getSetting(NM_SETTING_WIRELESS_SETTING_NAME));
91
91
                if (wireless && wireless->getSecurity() != getType())
92
92
                {
93
 
                        printf("WirelessSecurity::getEnabled false %s\n", wireless->getSecurity().ascii());
 
93
                        kdDebug() << "WirelessSecurity::getEnabled false " << wireless->getSecurity().ascii() << endl;
94
94
                        return false;
95
95
                }
96
96
        }
113
113
void
114
114
WirelessSecurity::setWepKey(int idx, QString key)
115
115
{
116
 
        printf("WirelessSecurity::setWepKey %i %s\n", idx, key.ascii());
 
116
        kdDebug() << "WirelessSecurity::setWepKey " << idx << " " << key.ascii() << endl;
117
117
        if (idx >= 0 && idx < 4)
118
118
                _wepKey[idx] = key;
119
119
}
304
304
void
305
305
WirelessSecurity::fromMap(const SettingsMap& map)
306
306
{
307
 
        printf("WirelessSecurity::fromMap\n");
 
307
        kdDebug() << "WirelessSecurity::fromMap" << endl;
308
308
 
309
309
        for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it)
310
310
        {
377
377
WirelessSecurity::toSecretsMap(bool with_settings) const
378
378
{
379
379
        SettingsMap map;
380
 
        printf("WirelessSecurity::toSecretsMap\n");
 
380
        kdDebug() << "WirelessSecurity::toSecretsMap" << endl;
381
381
        // first serialize the settings if needed
382
382
        if (with_settings)
383
383
                map = toMap();
391
391
        // wep keys
392
392
        if (!_wepKey[0].isNull())
393
393
        {
394
 
                printf("insert wep key0: %s\n", _wepKey[0].ascii());
 
394
                kdDebug() << "insert wep key0: " << _wepKey[0].ascii() << endl;
395
395
                map.insert(NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, QDBusData::fromString(_wepKey[0]));
396
396
        }
397
397
 
419
419
bool
420
420
WirelessSecurity::fromSecretsMap(const SettingsMap& map)
421
421
{
422
 
        printf("WirelessSecurity::fromMap\n");
 
422
        kdDebug() << "WirelessSecurity::fromMap" << endl;
423
423
 
424
424
        for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it)
425
425
        {