Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1:Update
NetworkManager-kde
fix_passwords_in_debug.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix_passwords_in_debug.diff of Package NetworkManager-kde
Index: knetworkmanager/src/knetworkmanager-accesspoint.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-accesspoint.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-accesspoint.cpp (working copy) @@ -176,7 +176,7 @@ #if 0 AccessPoint& AccessPoint::operator= (const AccessPoint& other) { - printf("AccessPoint::operator=\n"); + kdDebug() << "AccessPoint::operator=\n" << endl; d->objPath = other.d->objPath; d->nmAccessPoint = other.d->nmAccessPoint; connect(d->nmAccessPoint, SIGNAL(PropertiesChanged(const QMap<QString, QDBusVariant>&)), this, SLOT(slotPropertiesChanged(const QMap<QString, QDBusVariant>&))); Index: knetworkmanager/src/knetworkmanager-tray.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-tray.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-tray.cpp (working copy) @@ -324,7 +324,7 @@ Q_UNUSED(hints); Q_UNUSED(request_new); - printf("Tray::slotVPNSecretsNeeded\n"); + kdDebug() << "Tray::slotVPNSecretsNeeded" << endl; ConnectionSettings::VPNConnection* conn = dynamic_cast<ConnectionSettings::VPNConnection*>(connection); VPNAuthenticationDialog* auth = new VPNAuthenticationDialog(conn, this, "vpnauth"); auth->show(); @@ -636,13 +636,13 @@ void Tray::slotDeviceAddedNotify(Device* dev) { - printf("Tray::slotDeviceAddedNotify\n"); + kdDebug() << "Tray::slotDeviceAddedNotify" << endl; KNotifyClient::event( winId(), "knm-nm-device-added", i18n("New network device %1 found").arg(dev->getInterface()) ); } void Tray::slotDeviceRemovedNotify(Device* dev) { - printf("Tray::slotDeviceRemovedNotify\n"); + kdDebug() << "Tray::slotDeviceRemovedNotify" << endl; KNotifyClient::event( winId(), "knm-nm-device-removed", i18n("Network device %1 removed").arg(dev->getInterface()) ); } Index: knetworkmanager/src/knetworkmanager-connection_setting_wireless_security.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-connection_setting_wireless_security.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-connection_setting_wireless_security.cpp (working copy) @@ -90,7 +90,7 @@ Wireless* wireless = dynamic_cast<Wireless*>(conn->getSetting(NM_SETTING_WIRELESS_SETTING_NAME)); if (wireless && wireless->getSecurity() != getType()) { - printf("WirelessSecurity::getEnabled false %s\n", wireless->getSecurity().ascii()); + kdDebug() << "WirelessSecurity::getEnabled false " << wireless->getSecurity().ascii() << endl; return false; } } @@ -113,7 +113,7 @@ void WirelessSecurity::setWepKey(int idx, QString key) { - printf("WirelessSecurity::setWepKey %i %s\n", idx, key.ascii()); + kdDebug() << "WirelessSecurity::setWepKey " << idx << " " << key.ascii() << endl; if (idx >= 0 && idx < 4) _wepKey[idx] = key; } @@ -304,7 +304,7 @@ void WirelessSecurity::fromMap(const SettingsMap& map) { - printf("WirelessSecurity::fromMap\n"); + kdDebug() << "WirelessSecurity::fromMap" << endl; for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it) { @@ -377,7 +377,7 @@ WirelessSecurity::toSecretsMap(bool with_settings) const { SettingsMap map; - printf("WirelessSecurity::toSecretsMap\n"); + kdDebug() << "WirelessSecurity::toSecretsMap" << endl; // first serialize the settings if needed if (with_settings) map = toMap(); @@ -391,7 +391,7 @@ // wep keys if (!_wepKey[0].isNull()) { - printf("insert wep key0: %s\n", _wepKey[0].ascii()); + kdDebug() << "insert wep key0: " << _wepKey[0].ascii() << endl; map.insert(NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, QDBusData::fromString(_wepKey[0])); } @@ -419,7 +419,7 @@ bool WirelessSecurity::fromSecretsMap(const SettingsMap& map) { - printf("WirelessSecurity::fromMap\n"); + kdDebug() << "WirelessSecurity::fromMap" << endl; for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it) { Index: knetworkmanager/src/knetworkmanager-connection_secrets_dbus.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-connection_secrets_dbus.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-connection_secrets_dbus.cpp (working copy) @@ -104,12 +104,12 @@ { QDBusMessage reply; - printf("SendGetSecretsReply1 id %i\n", d->currentRequest); + kdDebug() << "SendGetSecretsReply1 id " << d->currentRequest << endl; // if no secret is needed we should not send one, right? if (d->currentRequest < 0) return; - printf("SendGetSecretsReply2\n"); + kdDebug() << "SendGetSecretsReply2" << endl; /* // no such setting if (!setting) @@ -118,19 +118,19 @@ } else { - printf("SendGetSecretsReply3\n"); + kdDebud() << "SendGetSecretsReply3" << endl; // copy the settingsmap over to a variantmap QMap<QString, QDBusData> map = setting->toSecretsMap(); // only take used settings if (map.size() == 0) { - printf("SendGetSecretsReply4\n"); + kdDebug() << "SendGetSecretsReply4" << endl; GetSecretsAsyncError(d->currentRequest, QDBusError::stdFailed("Requested setting is empty")); } else { - printf("SendGetSecretsReply5\n"); + kdDebug() << "SendGetSecretsReply5" << endl; QDBusDataMap<QString> secrets(map); QMap<QString, QDBusVariant> secrets; @@ -141,7 +141,7 @@ var.signature = var.value.buildDBusSignature(); secrets.insert(it2.key(), var); } - printf("SendGetSecretsReply6\n"); + kdDebug() << "SendGetSecretsReply6" << endl; GetSecretsAsyncReply(d->currentRequest, secrets); } @@ -153,10 +153,10 @@ // FIXME: ugly conversions, ask Kevin on how to make it better for (QValueList<ConnectionSetting*>::Iterator it = all_settings.begin(); it != all_settings.end(); ++it) { - printf(" Processing Setting '%s'\n", (*it)->getType().ascii()); + kdDebug() << " Processing Setting '" << (*it)->getType().ascii() << "'" << endl; if (!(*it)->isValid()) { - printf(" Setting '%s' is not valid, discarding\n", (*it)->getType().ascii()); + kdDebug() << " Setting '" << (*it)->getType().ascii() << "' is not valid, discarding" << endl; continue; } @@ -166,18 +166,18 @@ // only take used settings if (map.size() == 0) { - printf(" Setting '%s' is empty, discarding\n", (*it)->getType().ascii()); + kdDebug() << " Setting '" << (*it)->getType().ascii() << "' is empty, discarding" << endl; continue; } - printf(" Attach setting '%s'\n", (*it)->getType().ascii()); + kdDebug() << " Attach setting '" << (*it)->getType().ascii() << "'" << endl; QMap<QString, QDBusVariant> variant_map; for (QMap<QString, QDBusData>::Iterator it2 = map.begin(); it2 != map.end(); ++it2) { QString dataxml = XMLMarshaller::fromQDBusData(it2.data()); - printf(" %s: %s\n", it2.key().ascii(), dataxml.replace('\n', ' ').ascii()); + kdDebug() << " " << it2.key().ascii() << ": " << dataxml.replace('\n', ' ').ascii() << endl; QDBusVariant var; var.value = it2.data(); var.signature = var.value.buildDBusSignature(); @@ -200,7 +200,7 @@ void ConnectionSecretsDBus::GetSecretsAsync(int id, const QString& setting_name, const QStringList& hints, bool request_new) { - printf("Connection::GetSecretsAsync for setting %s, id %i\n", setting_name.ascii(), id); + kdDebug() << "Connection::GetSecretsAsync for setting " << setting_name.ascii() << ", " << id << endl; d->currentRequest = id; emit SecretsNeeded(setting_name, hints, request_new); } Index: knetworkmanager/src/knetworkmanager-connection_store.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-connection_store.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-connection_store.cpp (working copy) @@ -27,6 +27,7 @@ #include <kstaticdeleter.h> #include <kapplication.h> +#include <kdebug.h> #include "knetworkmanager-connection_store.h" #include "knetworkmanager-connection.h" @@ -76,7 +77,7 @@ void ConnectionStore::slotSecretsNeeded(Connection* conn, ConnectionSetting* setting, const QStringList& hints, bool request_new) { - printf("ConnectionStore::slotSecretsNeeded\n"); + kdDebug() << "ConnectionStore::slotSecretsNeeded" << endl; emit SecretsNeeded(conn, setting, hints, request_new); } Index: knetworkmanager/src/knetworkmanager-connection_dbus.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-connection_dbus.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-connection_dbus.cpp (working copy) @@ -81,7 +81,7 @@ bool ConnectionDBus::GetID(QString& id, QDBusError& /*error*/) { - printf("Connection::GetID\n"); + kdDebug() << "Connection::GetID" << endl; id = d->parent->getID(); return true; @@ -90,24 +90,24 @@ bool ConnectionDBus::GetSettings(QDBusDataMap<QString>& settings, QDBusError& /*error*/) { - printf("Connection::GetSettings, obj: %s\n", objectPath().ascii()); + kdDebug() << "Connection::GetSettings, obj: " << objectPath().ascii() << endl; QValueList<ConnectionSetting*> all_settings = d->parent->getSettings(); // FIXME: ugly conversions, ask Kevin on how to make it better for (QValueList<ConnectionSetting*>::Iterator it = all_settings.begin(); it != all_settings.end(); ++it) { - printf(" Processing Setting '%s'\n", (*it)->getType().ascii()); + kdDebug() << " Processing Setting '" << (*it)->getType().ascii() << "'" << endl; // only append this setting if it is really used if (!(*it)->getEnabled()) { - printf(" Setting '%s' is not enabled, discarding\n", (*it)->getType().ascii()); + kdDebug() << " Setting '" << (*it)->getType().ascii() << "' is not enabled, discarding" << endl; continue; } if (!(*it)->isValid()) { - printf(" Setting '%s' is not valid, discarding\n", (*it)->getType().ascii()); + kdDebug() << " Setting '" << (*it)->getType().ascii() << "' is not valid, discarding" << endl; continue; } @@ -117,18 +117,18 @@ // only take used settings if (map.size() == 0) { - printf(" Setting '%s' is empty, discarding\n", (*it)->getType().ascii()); + kdDebug() << " Setting '" << (*it)->getType().ascii() << "' is empty, discarding" << endl; continue; } - printf(" Attach setting '%s'\n", (*it)->getType().ascii()); + kdDebug() << " Attach setting '" << (*it)->getType().ascii() << "'" << endl; QMap<QString, QDBusVariant> variant_map; for (QMap<QString, QDBusData>::Iterator it2 = map.begin(); it2 != map.end(); ++it2) { QString dataxml = XMLMarshaller::fromQDBusData(it2.data()); - printf(" %s: %s\n", it2.key().ascii(), dataxml.replace('\n', ' ').ascii()); + kdDebug() << " " << it2.key().ascii() << ": " << dataxml.replace('\n', ' ').ascii() << endl; QDBusVariant var; var.value = it2.data(); var.signature = var.value.buildDBusSignature(); Index: knetworkmanager/src/knetworkmanager-hal_device_proxy.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-hal_device_proxy.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-hal_device_proxy.cpp (working copy) @@ -97,7 +97,7 @@ } if (!dbus_bus_name_has_owner (con, "org.freedesktop.Hal", NULL)) { - printf ("Error: HAL seems not to be running.\n"); + kdDebug() << "Error: HAL seems not to be running." << endl; goto out; } Index: knetworkmanager/src/knetworkmanager-connection_setting.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-connection_setting.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-connection_setting.cpp (working copy) @@ -63,7 +63,7 @@ SettingsMap ConnectionSetting::toSecretsMap(bool with_settings) const { - printf("ConnectionSetting::toSecretsMap\n"); + kdDebug() << "ConnectionSetting::toSecretsMap" << endl; return SettingsMap(); } Index: knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-wireless_device_tray.cpp (working copy) @@ -136,7 +136,7 @@ NMProxy* nm = NMProxy::getInstance(); Connection* active_conn = nm->getActiveConnection(d->dev); if (active_conn) - printf("%s\n", active_conn->getObjectPath().data()); + kdDebug() << active_conn->getObjectPath().data() << endl; // add all wireless connections in range // (we may have more then one connection per network) Index: knetworkmanager/src/knetworkmanager-cellular_device_tray.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-cellular_device_tray.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-cellular_device_tray.cpp (working copy) @@ -92,7 +92,7 @@ NMProxy* nm = NMProxy::getInstance(); Connection* active_conn = nm->getActiveConnection(d->dev); if (active_conn) - printf("%s\n", active_conn->getObjectPath().data()); + kdDebug() << active_conn->getObjectPath().data() << endl; // get all available Connections for cellular devices // WILLTODO : repeat for GSM Index: knetworkmanager/src/knetworkmanager-menuitem.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-menuitem.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-menuitem.cpp (working copy) @@ -76,7 +76,7 @@ { int id; QDBusError err; - printf("NetworkMenuItem::slotActivate()\n"); + kdDebug() << "NetworkMenuItem::slotActivate()" << endl; NMProxy* nm = NMProxy::getInstance(); if (d->dev && d->conn) @@ -84,13 +84,14 @@ NMProxy* nm = NMProxy::getInstance(); if (nm) { - printf("Activate Connection %s on Device %s\n", d->conn->getObjectPath().data(), d->dev->getObjectPath().ascii()); + kdDebug() << "Activate Connection " << d->conn->getObjectPath().data() << " on Device " << d->dev->getObjectPath().ascii() << endl; + if (nm->ActivateConnectionAsync(id, NM_DBUS_SERVICE_USER_SETTINGS, d->conn->getObjectPath(), QDBusObjectPath(QCString(d->dev->getObjectPath())), d->conn->getObjectPath(), err)) { } else - printf("ActivateDevice failed\n"); + kdDebug() << "ActivateDevice failed" << endl; } } else if (d->conn) @@ -101,7 +102,7 @@ nm->ActivateConnectionAsync(id,NM_DBUS_SERVICE_USER_SETTINGS, d->conn->getObjectPath(), device, act_conn, err); } else - printf("Device or Connection invalid\n"); + kdDebug() << "Device or Connection invalid" << endl; } NetworkMenuItem::NetworkMenuItem (Device* dev, Connection* conn, QObject* parent, const char* name) Index: knetworkmanager/src/knetworkmanager-wired_device_tray.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-wired_device_tray.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-wired_device_tray.cpp (working copy) @@ -89,7 +89,7 @@ NMProxy* nm = NMProxy::getInstance(); Connection* active_conn = nm->getActiveConnection(d->dev); if (active_conn) - printf("%s\n", active_conn->getObjectPath().data()); + kdDebug() << active_conn->getObjectPath().data() << endl; // get all available Connections for wired devices QValueList<Connection*> connections = connectionStore->getConnections(NM_SETTING_WIRED_SETTING_NAME); Index: knetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-connection_setting_8021x.cpp (working copy) @@ -237,7 +237,7 @@ void IEEE8021x::fromMap(const SettingsMap& map) { - printf("IEEE8021x::fromMap\n"); + kdDebug() << "IEEE8021x::fromMap" << endl; for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it) { @@ -295,7 +295,7 @@ IEEE8021x::toSecretsMap(bool with_settings) const { SettingsMap map; - printf("IEEE8021x::toSecretsMap\n"); + kdDebug() << "IEEE8021x::toSecretsMap" << endl; // first serialize the settings if needed if (with_settings) map = toMap(); @@ -316,7 +316,7 @@ bool IEEE8021x::fromSecretsMap(const SettingsMap& map) { - printf("IEEE8021x::fromMap\n"); + kdDebug() << "IEEE8021x::fromMap" << endl; for (SettingsMap::ConstIterator it = map.begin(); it != map.end(); ++it) { Index: knetworkmanager/src/sha1.cpp =================================================================== --- knetworkmanager/src/sha1.cpp (revision 873971) +++ knetworkmanager/src/sha1.cpp (working copy) @@ -377,14 +377,7 @@ #ifdef VERBOSE /* SAK */ void SHAPrintContext(SHA1_CTX *context, char *msg) { - printf("%s (%d,%d) %x %x %x %x %x\n", - msg, - context->count[0], context->count[1], - context->state[0], - context->state[1], - context->state[2], - context->state[3], - context->state[4]); + kdDebug() << msg << " (" << context->count[0] << "," << context->count[1] << ") " << context->state[0] << " " << context->state[1] << " " << context->state[2] << " " << context->state[3] << " " << context->state[4] << endl; } #endif @@ -640,38 +633,38 @@ u8 res[512]; int ret = 0, i; - printf("PRF-SHA1 test cases:\n"); + kdDebug() << "PRF-SHA1 test cases:" << endl; sha1_prf(key0, sizeof(key0), "prefix", data0, sizeof(data0) - 1, res, sizeof(prf0)); if (memcmp(res, prf0, sizeof(prf0)) == 0) - printf("Test case 0 - OK\n"); + kdDebug() << "Test case 0 - OK" << endl; else { - printf("Test case 0 - FAILED!\n"); + kdDebug() << "Test case 0 - FAILED!" << endl; ret++; } sha1_prf(key1, sizeof(key1) - 1, "prefix", data1, sizeof(data1) - 1, res, sizeof(prf1)); if (memcmp(res, prf1, sizeof(prf1)) == 0) - printf("Test case 1 - OK\n"); + kdDebug() << "Test case 1 - OK" << endl; else { - printf("Test case 1 - FAILED!\n"); + kdDebug() << "Test case 1 - FAILED!" << endl; ret++; } sha1_prf(key2, sizeof(key2), "prefix", data2, sizeof(data2), res, sizeof(prf2)); if (memcmp(res, prf2, sizeof(prf2)) == 0) - printf("Test case 2 - OK\n"); + kdDebug() << "Test case 2 - OK" << endl; else { - printf("Test case 2 - FAILED!\n"); + kdDebug() << "Test case 2 - FAILED!" << endl; ret++; } ret += test_eap_fast(); - printf("PBKDF2-SHA1 Passphrase test cases:\n"); + kdDebug() << "PBKDF2-SHA1 Passphrase test cases:" << endl; for (i = 0; i < NUM_PASSPHRASE_TESTS; i++) { u8 psk[32]; struct passphrase_test *test = &passphrase_tests[i]; @@ -679,9 +672,9 @@ test->ssid, strlen(test->ssid), 4096, psk, 32); if (memcmp(psk, test->psk, 32) == 0) - printf("Test case %d - OK\n", i); + kdDebug() << "Test case " << i << " - OK" << endl; else { - printf("Test case %d - FAILED!\n", i); + kdDebug() << "Test case " << i << " - FAILED!" << endl; ret++; } } Index: knetworkmanager/src/knetworkmanager-connection.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-connection.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-connection.cpp (working copy) @@ -166,7 +166,7 @@ void Connection::slotSecretsNeeded(const QString& setting_name, const QStringList& hints, bool request_new) { - printf("Connection::slotSecretsNeeded %s, new: %s\n", setting_name.ascii(), request_new ? "yes" : "no"); + kdDebug() << "Connection::slotSecretsNeeded " << setting_name.ascii() << ", new: " << (request_new ? "yes" : "no") << endl; ConnectionSetting* setting = getSetting(setting_name); if (!setting) Index: knetworkmanager/src/knetworkmanager-devicestore.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-devicestore.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-devicestore.cpp (working copy) @@ -61,7 +61,7 @@ void DeviceStore::slotDeviceRemoved(const QDBusObjectPath & obj_path) { - printf("DeviceStore::slotDeviceRemoved\n"); + kdDebug() << "DeviceStore::slotDeviceRemoved" << endl; QMap<QString, Device*>::Iterator it = d->devices.find(QString(obj_path)); if (it != d->devices.end()) { Index: knetworkmanager/src/knetworkmanager-nmsettings.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-nmsettings.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-nmsettings.cpp (working copy) @@ -70,7 +70,7 @@ d = new NMSettingsPrivate(); QDBusConnection conn = QDBusConnection::systemBus(); - printf("NMSettings::NMSettings\n"); + kdDebug() << "NMSettings::NMSettings" << endl; // request the name for the settings interface if (!conn.requestName(NM_DBUS_SERVICE_USER_SETTINGS)) Index: knetworkmanager/src/knetworkmanager-storage.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-storage.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-storage.cpp (working copy) @@ -205,7 +205,7 @@ if ( !restoreSetting(conn, *it) ) { // setting could not be restored -> Error - printf(" Connection %s could not be restored.\n", id.ascii()); + kdDebug() << " Connection " << id.ascii() << " could not be restored." << endl; kdError() << k_funcinfo << " Connection " << id << " could not be restored." << endl; delete conn; conn = NULL; @@ -221,7 +221,7 @@ if ( !restoreSecrets(conn, *it) ) { // setting could not be restored -> Error - printf(" Connection %s could not be restored.\n", id.ascii()); + kdDebug() << " Connection " << id.ascii() << " could not be restored." << endl; kdError() << k_funcinfo << " Connection " << id << " could not be restored." << endl; delete conn; conn = NULL; @@ -236,7 +236,7 @@ Storage::restoreSetting(Connection* conn, const QString& setting_grp_name) { kdDebug() << k_funcinfo << " " << setting_grp_name << endl; - printf("restore setting: %s\n", setting_grp_name.ascii()); + kdDebug() << "restore setting: " << setting_grp_name.ascii() << endl; KConfigGroup setting_grp(KGlobal::config(), setting_grp_name); QMap<QString, QString> config_map = KGlobal::config()->entryMap(setting_grp_name); @@ -276,7 +276,7 @@ Storage::restoreSecrets(Connection* conn, const QString& secrets_grp_name) { kdDebug() << k_funcinfo << " " << secrets_grp_name << endl; - printf("restore secret: %s\n", secrets_grp_name.ascii()); + kdDebug() << "restore secret: " << secrets_grp_name.ascii() << endl; KConfigGroup secrets_grp(KGlobal::config(), secrets_grp_name); QMap<QString, QString> config_map = KGlobal::config()->entryMap(secrets_grp_name); @@ -317,7 +317,7 @@ Storage::saveConnections() { kdDebug() << k_funcinfo << endl; - printf("Storage::saveConnections\n"); + kdDebug() << "Storage::saveConnections" << endl; // write all connections we get from the connection-store to disk ConnectionStore* store = ConnectionStore::getInstance(); QValueList<ConnectionSettings::Connection*> connections = store->getConnections(); @@ -338,7 +338,7 @@ QString cType = conn->getType(); kdDebug() << k_funcinfo << " <" << id << ">" << endl; - printf("Storage::saveConnection %s\n", id.ascii()); + kdDebug() << "Storage::saveConnection " << id.ascii() << endl; // connections without id are evil if (id.isEmpty() || cType.isEmpty()) @@ -479,7 +479,7 @@ QString id = connection->getID(); QString type = setting->getType(); - printf("Storage::hasSecretsStored\n"); + kdDebug() << "Storage::hasSecretsStored" << endl; // ID is necessary if (id.isEmpty()) @@ -518,7 +518,7 @@ QString id = connection->getID(); QString type = setting->getType(); - printf("Storage::restoreSecrets\n"); + kdDebug() << "Storage::restoreSecrets" << endl; // ID is necessary if (id.isEmpty()) return false; @@ -538,7 +538,7 @@ QString cType = conn->getType(); kdDebug() << k_funcinfo << " <" << id << ">" << endl; - printf("Storage::deleteConnection %s\n", id.ascii()); + kdDebug() << "Storage::deleteConnection " << id.ascii() << endl; // connections without id are evil if (id.isEmpty() || cType.isEmpty()) Index: knetworkmanager/src/knetworkmanager-vpnmanager.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-vpnmanager.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-vpnmanager.cpp (working copy) @@ -56,7 +56,7 @@ KConfig* kconfig = new KConfig (service, true, true, "config"); kconfig->setGroup ("VPN Connection"); -printf("VPN Service %s\n", kconfig->readEntry ("name", QString::null).ascii()); +kdDebug() << "VPN Service " << kconfig->readEntry ("name", QString::null).ascii() << endl; // create new VPNService Object VPNService* vpnservice = new VPNService(kconfig->readEntry ("name", QString::null), kconfig->readEntry ("service", QString::null), KNetworkManager::getInstance()); Index: knetworkmanager/src/knetworkmanager-connection_settings_dialog.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-connection_settings_dialog.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-connection_settings_dialog.cpp (working copy) @@ -101,7 +101,7 @@ ConnectionSettingsDialogImpl::~ConnectionSettingsDialogImpl() { - printf("ConnectionSettingsDialogImpl::~ConnectionSettingsDialogImpl\n"); + kdDebug() << "ConnectionSettingsDialogImpl::~ConnectionSettingsDialogImpl" << endl; } /* @@ -333,7 +333,7 @@ } else { - printf("ActivateConnection failed\n"); + kdDebug() << "ActivateConnection failed" << endl; } } } Index: knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-connection_setting_wireless_security_widget.cpp (working copy) @@ -721,7 +721,7 @@ void WirelessSecurityWidgetImpl::Activate() { - printf("Activate %s\n", _new_conn ? "New" : "Edit"); + kdDebug() << "Activate " << (_new_conn ? "New" : "Edit") << endl; comboSecurityInit(); } @@ -740,7 +740,7 @@ { aps = WirelessManager::getAccessPointsForEssid(_wireless_setting->getEssid()); #if 0 - printf("Hugo %s\n", QString(QCString(_wireless_setting->getEssid())).ascii()); + kdDebug() << "Hugo " << QString(QCString(_wireless_setting->getEssid())).ascii() << endl; #endif } if (!aps.isEmpty()) @@ -750,7 +750,7 @@ { if((*it)->isEncrypted()) { - printf("AP %s is encrypted\n", (*it)->getDisplaySsid().ascii()); + kdDebug() << "AP " << (*it)->getDisplaySsid().ascii() << " is encrypted" << endl; if ((*it)->getRsnFlags() != NM_802_11_AP_SEC_NONE || (*it)->getWpaFlags() != NM_802_11_AP_SEC_NONE) { // WPA or RSN Index: knetworkmanager/src/knetworkmanager-wireless_menuitem.cpp =================================================================== --- knetworkmanager/src/knetworkmanager-wireless_menuitem.cpp (revision 873971) +++ knetworkmanager/src/knetworkmanager-wireless_menuitem.cpp (working copy) @@ -67,9 +67,9 @@ { if ( _conn ) { - printf("Activate Connection %s on Device %s\n", _conn->getObjectPath().data(), _dev->getObjectPath().ascii()); + kdDebug() << "Activate Connection " << _conn->getObjectPath().data() << " on Device " << _dev->getObjectPath().ascii() << endl; if (!nm->ActivateConnectionAsync(id, NM_DBUS_SERVICE_USER_SETTINGS, _conn->getObjectPath(), QDBusObjectPath(QCString(_dev->getObjectPath())), _conn->getObjectPath(), err)) - printf("ActivateDevice failed\n"); + kdDebug() << "ActivateDevice failed" << endl; } else
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
