File nm-0_9-compatibility.patch of Package knetworkmanager-kde3
diff -ur knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-cellular_device_tray.cpp knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-cellular_device_tray.cpp
--- knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-cellular_device_tray.cpp 2010-01-16 03:02:53.000000000 +0300
+++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-cellular_device_tray.cpp 2011-06-13 06:02:28.201824802 +0400
@@ -66,11 +66,10 @@
// create an appropriate connection
Connection* conn = 0;
switch (d->dev->getDeviceType()) {
- case DEVICE_TYPE_GSM:
+ case NM_DEVICE_TYPE_MODEM:
conn = new GSMConnection();
break;
- case DEVICE_TYPE_CDMA:
- conn = new CDMAConnection();
+ default :
break;
}
diff -ur knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-connection_setting_gsm.cpp knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_setting_gsm.cpp
--- knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-connection_setting_gsm.cpp 2010-01-16 03:02:53.000000000 +0300
+++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_setting_gsm.cpp 2011-06-13 07:22:31.584730364 +0400
@@ -163,7 +163,6 @@
map.insert(NM_SETTING_GSM_NETWORK_ID, QDBusData::fromString(_network_id));
}
map.insert(NM_SETTING_GSM_NETWORK_TYPE, QDBusData::fromInt32(_network_type));
- map.insert(NM_SETTING_GSM_BAND, QDBusData::fromInt32(_band));
return map;
}
@@ -183,10 +182,6 @@
if (!_pin.isEmpty()) {
map.insert(NM_SETTING_GSM_PIN, QDBusData::fromString(_pin));
}
- if (!_puk.isEmpty()) {
- map.insert(NM_SETTING_GSM_PUK, QDBusData::fromString(_puk));
- }
-
return map;
}
@@ -200,8 +195,6 @@
setPassword(it.data().toString());
else if (it.key() == NM_SETTING_GSM_PIN)
setPin(it.data().toString());
- else if (it.key() == NM_SETTING_GSM_PUK)
- setPuk(it.data().toString());
else
kdWarning() << k_funcinfo << " Unknown secret: " << it.key() << endl;
}
@@ -224,8 +217,6 @@
setNetworkID(it.data().toString());
else if (it.key() == NM_SETTING_GSM_NETWORK_TYPE)
setNetworkType(it.data().toUInt32());
- else if (it.key() == NM_SETTING_GSM_BAND)
- setBand(it.data().toUInt32());
else
kdWarning() << k_funcinfo << " Unknown setting: " << it.key() << endl;
}
diff -ur knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-connection_settings_dialog.cpp knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_settings_dialog.cpp
--- knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-connection_settings_dialog.cpp 2010-01-16 03:02:53.000000000 +0300
+++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_settings_dialog.cpp 2011-06-13 15:38:43.996029295 +0400
@@ -253,14 +253,14 @@
ConnectionSettingsDialogImpl::getDeviceTypeFromConnection(Connection* conn)
{
if (conn->getType() == NM_SETTING_WIRELESS_SETTING_NAME)
- return DEVICE_TYPE_802_11_WIRELESS;
+ return NM_DEVICE_TYPE_WIFI;
else if (conn->getType() == NM_SETTING_WIRED_SETTING_NAME)
- return DEVICE_TYPE_802_3_ETHERNET;
+ return NM_DEVICE_TYPE_ETHERNET;
else if (conn->getType() == NM_SETTING_GSM_SETTING_NAME)
- return DEVICE_TYPE_GSM;
+ return NM_DEVICE_TYPE_MODEM;
else if (conn->getType() == NM_SETTING_CDMA_SETTING_NAME)
- return DEVICE_TYPE_CDMA;
- return DEVICE_TYPE_UNKNOWN;
+ return NM_DEVICE_TYPE_MODEM;
+ return NM_DEVICE_TYPE_UNKNOWN;
}
void
@@ -291,12 +291,12 @@
{
QDBusObjectPath act_conn = nm->getDefaultActiveConnection();
QDBusObjectPath device = nm->getDeviceForActiveConnection(act_conn);
- nm->ActivateConnectionAsync(id,NM_DBUS_SERVICE_USER_SETTINGS, _conn->getObjectPath(), device, act_conn, err);
+ nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", _conn->getObjectPath(), device, act_conn, err);
}
else
{
// we need to call ActivateDevice async
- nm->ActivateConnectionAsync(id, NM_DBUS_SERVICE_USER_SETTINGS, _conn->getObjectPath(), QDBusObjectPath(QCString(dev->getObjectPath())), _conn->getObjectPath(), err);
+ nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", _conn->getObjectPath(), QDBusObjectPath(QCString(dev->getObjectPath())), _conn->getObjectPath(), err);
}
}
}
diff -ur knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-devicestore.cpp knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-devicestore.cpp
--- knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-devicestore.cpp 2010-01-16 03:02:53.000000000 +0300
+++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-devicestore.cpp 2011-06-13 05:52:00.525160842 +0400
@@ -105,18 +105,15 @@
// select the right device type and create the appropriate objects
switch(type)
{
- case DEVICE_TYPE_802_11_WIRELESS:
+ case NM_DEVICE_TYPE_WIFI:
new_dev = new WirelessDevice(obj_path);
break;
- case DEVICE_TYPE_802_3_ETHERNET:
+ case NM_DEVICE_TYPE_ETHERNET:
new_dev = new WiredDevice(obj_path);
break;
- case DEVICE_TYPE_GSM:
+ case NM_DEVICE_TYPE_MODEM:
new_dev = new GSMDevice(obj_path);
break;
- case DEVICE_TYPE_CDMA:
- new_dev = new CDMADevice(obj_path);
- break;
default:
kdWarning() << k_funcinfo << "Unknown devicetype" << endl;
new_dev = new Device(obj_path);
diff -ur knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-menuitem.cpp knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-menuitem.cpp
--- knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-menuitem.cpp 2010-01-16 03:02:53.000000000 +0300
+++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-menuitem.cpp 2011-06-13 15:45:27.912466096 +0400
@@ -86,7 +86,7 @@
{
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))
+ if (nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", d->conn->getObjectPath(), QDBusObjectPath(QCString(d->dev->getObjectPath())), d->conn->getObjectPath(), err))
{
}
@@ -99,7 +99,7 @@
// no device given, just take the default device
QDBusObjectPath act_conn = nm->getDefaultActiveConnection();
QDBusObjectPath device = nm->getDeviceForActiveConnection(act_conn);
- nm->ActivateConnectionAsync(id,NM_DBUS_SERVICE_USER_SETTINGS, d->conn->getObjectPath(), device, act_conn, err);
+ nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", d->conn->getObjectPath(), device, act_conn, err);
}
else
kdDebug() << "Device or Connection invalid" << endl;
diff -ur knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-nmsettings.cpp knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-nmsettings.cpp
--- knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-nmsettings.cpp 2010-01-16 03:02:53.000000000 +0300
+++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-nmsettings.cpp 2011-06-13 15:47:41.989208715 +0400
@@ -73,8 +73,8 @@
kdDebug() << "NMSettings::NMSettings" << endl;
// request the name for the settings interface
- if (!conn.requestName(NM_DBUS_SERVICE_USER_SETTINGS))
- kdError() << "req name failed for " << NM_DBUS_SERVICE_USER_SETTINGS << endl;
+ if (!conn.requestName("org.freedesktop.NetworkManagerUserSettings"))
+ kdError() << "req name failed for " << "org.freedesktop.NetworkManagerUserSettings" << endl;
// request the name for the connections here too
if (!conn.requestName(NM_DBUS_IFACE_SETTINGS_CONNECTION))
diff -ur knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-tray.cpp knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-tray.cpp
--- knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-tray.cpp 2010-01-16 03:02:53.000000000 +0300
+++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-tray.cpp 2011-06-13 05:41:53.814960891 +0400
@@ -499,14 +499,13 @@
// different tray icons for different device types!
switch (dev->getDeviceType())
{
- case DEVICE_TYPE_802_3_ETHERNET:
+ case NM_DEVICE_TYPE_ETHERNET:
devTray = new WiredDeviceTray(dynamic_cast<WiredDevice*>(dev), this, "wired_device_tray");
break;
- case DEVICE_TYPE_802_11_WIRELESS:
+ case NM_DEVICE_TYPE_WIFI:
devTray = new WirelessDeviceTray(static_cast<WirelessDevice*>(dev), this, "wireless_device_tray");
break;
- case DEVICE_TYPE_GSM:
- case DEVICE_TYPE_CDMA:
+ case NM_DEVICE_TYPE_MODEM:
devTray = new CellularDeviceTray(static_cast<CellularDevice*>(dev), this, "cellular_device_tray");
break;
default:
diff -ur knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-wireless_manager.cpp knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-wireless_manager.cpp
--- knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-wireless_manager.cpp 2010-01-16 03:02:53.000000000 +0300
+++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-wireless_manager.cpp 2011-06-13 08:20:07.696654276 +0400
@@ -108,7 +108,7 @@
DeviceStore* store = DeviceStore::getInstance();
if (store)
{
- QValueList<Device*> devs = store->getDevices(DEVICE_TYPE_802_11_WIRELESS);
+ QValueList<Device*> devs = store->getDevices(NM_DEVICE_TYPE_WIFI);
for (QValueList<Device*>::Iterator it = devs.begin(); it != devs.end(); ++it)
{
WirelessDevice* wdev = dynamic_cast<WirelessDevice*>(*it);
@@ -151,7 +151,7 @@
DeviceStore* store = DeviceStore::getInstance();
if (store)
{
- QValueList<Device*> devs = store->getDevices(DEVICE_TYPE_802_11_WIRELESS);
+ QValueList<Device*> devs = store->getDevices(NM_DEVICE_TYPE_WIFI);
for (QValueList<Device*>::Iterator it = devs.begin(); it != devs.end(); ++it)
{
WirelessDevice* wdev = dynamic_cast<WirelessDevice*>(*it);
diff -ur knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-wireless_menuitem.cpp knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-wireless_menuitem.cpp
--- knetworkmanager.orig/knetworkmanager-0.7/src/knetworkmanager-wireless_menuitem.cpp 2010-01-16 03:02:53.000000000 +0300
+++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-wireless_menuitem.cpp 2011-06-13 15:49:44.908640754 +0400
@@ -68,7 +68,7 @@
if ( _conn )
{
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))
+ if (!nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", _conn->getObjectPath(), QDBusObjectPath(QCString(_dev->getObjectPath())), _conn->getObjectPath(), err))
kdDebug() << "ActivateDevice failed" << endl;
}
