Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Tue May 17 13:27:16 CEST 2011.
-------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2011-04-21 13:01:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2011-04-28 18:13:56.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 28 18:13:42 CEST 2011 - [email protected] + +- update to 4.6.3 + * Bugfixes over KDE 4.6.2 + * see http://kde.org/announcements/changelogs/changelog4_6_2to4_6_3.php for details + + +------------------------------------------------------------------- --- KDE/kdebase4-workspace/kdebase4-workspace.changes 2011-04-21 13:01:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-workspace.changes 2011-05-04 11:30:45.000000000 +0200 @@ -1,0 +2,13 @@ +Wed May 4 09:29:55 UTC 2011 - [email protected] + +- Added Patch for NM 0.9 compatibility (only for Factory) + +------------------------------------------------------------------- +Thu Apr 28 18:13:42 CEST 2011 - [email protected] + +- update to 4.6.3 + * Bugfixes over KDE 4.6.2 + * see http://kde.org/announcements/changelogs/changelog4_6_2to4_6_3.php for details + + +------------------------------------------------------------------- --- KDE/kdebase4-workspace/python-kdebase4.changes 2011-04-21 13:01:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/python-kdebase4.changes 2011-04-28 18:13:57.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Apr 28 18:13:42 CEST 2011 - [email protected] + +- update to 4.6.3 + * Bugfixes over KDE 4.6.2 + * see http://kde.org/announcements/changelogs/changelog4_6_2to4_6_3.php for details + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bko261593-b2a32244-plasma-assert.diff bko270228-shutdown-fix.diff kdebase-workspace-4.6.2.tar.bz2 New: ---- kdebase-workspace-4.6.1-nm-09-compat.patch kdebase-workspace-4.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.pOeraO/_old 2011-05-17 13:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pOeraO/_new 2011-05-17 13:23:54.000000000 +0200 @@ -22,8 +22,8 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.6.2 -Release: 2 +Version: 4.6.3 +Release: 1 BuildRequires: libdbusmenu-qt-devel BuildRequires: libkdepimlibs4-devel >= %version BuildRequires: libqimageblitz-devel ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.pOeraO/_old 2011-05-17 13:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pOeraO/_new 2011-05-17 13:23:54.000000000 +0200 @@ -22,8 +22,8 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.6.2 -Release: 3 +Version: 4.6.3 +Release: 1 BuildRequires: audit-devel BuildRequires: bluez-devel BuildRequires: ConsoleKit-devel @@ -35,7 +35,11 @@ BuildRequires: libkdepimlibs4-devel BuildRequires: liblazy-devel BuildRequires: libQtWebKit-devel -BuildRequires: NetworkManager-devel +%if %suse_version > 1140 +BuildRequires: NetworkManager-devel > 0.8.997 +%else +BuildRequires: NetworkManager-devel < 0.8.5 +%endif %if %suse_version < 1120 BuildRequires: libpolkit-qt-devel %else @@ -106,9 +110,12 @@ Patch201: plasma-notifications-kill-timer.diff Patch208: kdm-themer-wallpaper-sizes.diff Patch211: disable-python-support.diff -Patch212: bko270228-shutdown-fix.diff -Patch213: bko261593-b2a32244-plasma-assert.diff Patch214: kwin-multihead.diff +## Additional Patch for compatbility with NM 0.9 +## As required by Factory at the moment +%if %suse_version > 1140 +Patch215: kdebase-workspace-4.6.1-nm-09-compat.patch +%endif Requires: kde4-kgreeter-plugins = %version Requires: kdebase4-workspace-liboxygenstyle = %version %kde4_runtime_requires @@ -200,9 +207,10 @@ ###KDE45: rediff! - kdm code may have added similar functionality #%patch208 %patch211 -%patch212 -p1 -%patch213 -p1 %patch214 +%if %suse_version > 1140 +%patch215 -p1 +%endif cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.pOeraO/_old 2011-05-17 13:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pOeraO/_new 2011-05-17 13:23:54.000000000 +0200 @@ -26,8 +26,8 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.6.2 -Release: 2 +Version: 4.6.3 +Release: 1 BuildRequires: NetworkManager-devel bluez-devel libQtWebKit-devel libdbusmenu-qt-devel libkdepimlibs4-devel >= %version libqimageblitz-devel BuildRequires: libknotificationitem-devel libsmbclient-devel libxklavier-devel python-kde4-devel >= %version Source0: kdebase-workspace-%version.tar.bz2 ++++++ kdebase-workspace-4.6.1-nm-09-compat.patch ++++++ diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml 2011-04-30 08:39:45.504050737 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> - <interface name="org.freedesktop.NetworkManager.Connection.Active"> + <interface name="org.freedesktop.NetworkManagerCompat.Connection.Active"> <property name="ServiceName" type="s" access="read"> <tp:docstring>The D-Bus service name providing this connection.</tp:docstring> </property> diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml 2011-04-30 08:39:45.541050273 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> - <interface name="org.freedesktop.NetworkManager.Device.Wired"> + <interface name="org.freedesktop.NetworkManagerCompat.Device.Wired"> <property name="HwAddress" type="s" access="read"> <tp:docstring> diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml 2011-04-30 08:39:45.545050225 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> - <interface name="org.freedesktop.NetworkManager.Device.Wireless"> + <interface name="org.freedesktop.NetworkManagerCompat.Device.Wireless"> <method name="GetAccessPoints"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_access_points"/> <arg name="access_points" type="ao" direction="out"> diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device.xml --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device.xml 2011-04-30 08:39:45.509050673 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> - <interface name="org.freedesktop.NetworkManager.Device"> + <interface name="org.freedesktop.NetworkManagerCompat.Device"> <property name="Udi" type="s" access="read"> <tp:docstring> Unique Device Identifier. diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml 2011-04-30 08:39:45.515050599 +0200 @@ -2,7 +2,7 @@ <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> - <interface name="org.freedesktop.NetworkManagerSettings.Connection"> + <interface name="org.freedesktop.NetworkManager.Settings.Connection"> <tp:docstring> Represents a single network connection configuration. </tp:docstring> @@ -59,7 +59,7 @@ </interface> - <interface name="org.freedesktop.NetworkManagerSettings.Connection.Secrets"> + <interface name="org.freedesktop.NetworkManager.Settings.Connection.Secrets"> <tp:docstring> Secrets have a separate interface so that they can be locked down. </tp:docstring> diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml 2011-04-30 08:39:45.519050549 +0200 @@ -13,7 +13,7 @@ object. dbus-glib generates the same bo --> <node name="/"> - <interface name="org.freedesktop.NetworkManager"> + <interface name="org.freedesktop.NetworkManagerCompat"> <method name="GetDevices"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_devices"/> <arg name="devices" type="ao" direction="out"/> diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml 2011-04-30 08:39:45.522050512 +0200 @@ -8,7 +8,7 @@ --> <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> - <interface name="org.freedesktop.NetworkManager"> + <interface name="org.freedesktop.NetworkManagerCompat"> <method name="GetDevices"> <tp:docstring> Get the list of network devices. diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml 2011-04-30 08:39:45.524050486 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";> <node name="/"> - <interface name="org.freedesktop.NetworkManagerSettings.Connection"> + <interface name="org.freedesktop.NetworkManager.Settings.Connection"> <method name="GetID"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_connection_settings_get_id"/> <arg name="id" type="s" direction="out"/> @@ -17,7 +17,7 @@ </signal> <signal name="Removed"/> </interface> - <interface name="org.freedesktop.NetworkManagerSettings.Connection.Secrets"> + <interface name="org.freedesktop.NetworkManager.Settings.Connection.Secrets"> <method name="GetSecrets"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_connection_settings_get_secrets"/> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml 2011-04-30 08:39:45.525050473 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> - <interface name="org.freedesktop.NetworkManagerSettings"> + <interface name="org.freedesktop.NetworkManager.Settings"> <tp:docstring> The NetworkManagerSettings interface is provided by the service which provides connections to NetworkManager. </tp:docstring> diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml 2011-04-30 08:39:45.527050449 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> - <interface name="org.freedesktop.NetworkManager.Connection.Active"> + <interface name="org.freedesktop.NetworkManagerCompat.Connection.Active"> <property name="ServiceName" type="s" access="read"> <tp:docstring>The D-Bus service name providing this connection.</tp:docstring> </property> @@ -22,7 +22,7 @@ </property> </interface> - <interface name="org.freedesktop.NetworkManager.VPN.Connection"> + <interface name="org.freedesktop.NetworkManagerCompat.VPN.Connection"> <tp:docstring> Represents an active connection to a Virtual Private Network. </tp:docstring> diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h 2011-04-30 08:39:45.543050249 +0200 @@ -28,7 +28,7 @@ class OrgFreedesktopNetworkManagerDevice Q_OBJECT public: static inline const char *staticInterfaceName() - { return "org.freedesktop.NetworkManager.Device.Wired"; } + { return "org.freedesktop.NetworkManagerCompat.Device.Wired"; } public: OrgFreedesktopNetworkManagerDeviceWiredInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-deviceinterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-deviceinterface.h --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-deviceinterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-deviceinterface.h 2011-04-30 08:39:45.529050425 +0200 @@ -28,7 +28,7 @@ class OrgFreedesktopNetworkManagerDevice Q_OBJECT public: static inline const char *staticInterfaceName() - { return "org.freedesktop.NetworkManager.Device"; } + { return "org.freedesktop.NetworkManagerCompat.Device"; } public: OrgFreedesktopNetworkManagerDeviceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h 2011-04-30 08:39:45.547050199 +0200 @@ -28,7 +28,7 @@ class OrgFreedesktopNetworkManagerDevice Q_OBJECT public: static inline const char *staticInterfaceName() - { return "org.freedesktop.NetworkManager.Device.Wireless"; } + { return "org.freedesktop.NetworkManagerCompat.Device.Wireless"; } public: OrgFreedesktopNetworkManagerDeviceWirelessInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h 2011-04-30 08:39:45.531050399 +0200 @@ -31,7 +31,7 @@ class OrgFreedesktopNetworkManagerSettin Q_OBJECT public: static inline const char *staticInterfaceName() - { return "org.freedesktop.NetworkManagerSettings.Connection"; } + { return "org.freedesktop.NetworkManager.Settings.Connection"; } public: OrgFreedesktopNetworkManagerSettingsConnectionInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); @@ -64,7 +64,7 @@ class OrgFreedesktopNetworkManagerSettin Q_OBJECT public: static inline const char *staticInterfaceName() - { return "org.freedesktop.NetworkManagerSettings.Connection.Secrets"; } + { return "org.freedesktop.NetworkManager.Settings.Connection.Secrets"; } public: OrgFreedesktopNetworkManagerSettingsConnectionSecretsInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h 2011-04-30 08:39:45.533050373 +0200 @@ -28,7 +28,7 @@ class OrgFreedesktopNetworkManagerInterf Q_OBJECT public: static inline const char *staticInterfaceName() - { return "org.freedesktop.NetworkManager"; } + { return "org.freedesktop.NetworkManagerCompat"; } public: OrgFreedesktopNetworkManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h 2011-04-30 08:39:45.535050349 +0200 @@ -28,7 +28,7 @@ class OrgFreedesktopNetworkManagerVPNCon Q_OBJECT public: static inline const char *staticInterfaceName() - { return "org.freedesktop.NetworkManager.VPN.Connection"; } + { return "org.freedesktop.NetworkManagerCompat.VPN.Connection"; } public: OrgFreedesktopNetworkManagerVPNConnectionInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.cpp.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.cpp --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.cpp.nm-09-compat 2011-04-01 12:52:43.000000000 +0200 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.cpp 2011-04-30 08:46:01.279352899 +0200 @@ -21,7 +21,6 @@ along with this program. If not, see <h #include "manager_p.h" #include <KDebug> -#include <NetworkManager.h> #include "dbus/nm-deviceinterface.h" #include "networkmanagerdefinitions.h" @@ -31,12 +30,12 @@ along with this program. If not, see <h #include "networkcdmainterface.h" const QString NMNetworkManager::DBUS_SERVICE(QString::fromLatin1("org.freedesktop.NetworkManager")); -const QString NMNetworkManager::DBUS_DAEMON_PATH(QString::fromLatin1("/org/freedesktop/NetworkManager")); +const QString NMNetworkManager::DBUS_DAEMON_PATH(QString::fromLatin1("/org/freedesktop/NetworkManagerCompat")); const QString NMNetworkManager::DBUS_USER_SETTINGS_PATH(QString::fromLatin1("org.freedesktop.NetworkManagerUserSettings")); const QString NMNetworkManager::DBUS_SYSTEM_SETTINGS_PATH(QString::fromLatin1("org.freedesktop.NetworkManagerSystemSettings")); -NMNetworkManagerPrivate::NMNetworkManagerPrivate() : iface(NMNetworkManager::DBUS_SERVICE, "/org/freedesktop/NetworkManager", QDBusConnection::systemBus()) +NMNetworkManagerPrivate::NMNetworkManagerPrivate() : iface(NMNetworkManager::DBUS_SERVICE, "/org/freedesktop/NetworkManagerCompat", QDBusConnection::systemBus()) { kDebug(1441) << NMNetworkManager::DBUS_SERVICE; } @@ -118,16 +117,16 @@ QObject *NMNetworkManager::createNetwork uint deviceType = devIface.deviceType(); NMNetworkInterface * createdInterface = 0; switch ( deviceType ) { - case DEVICE_TYPE_802_3_ETHERNET: + case NM_DEVICE_TYPE_ETHERNET: createdInterface = new NMWiredNetworkInterface(uni, this, 0); // these are deleted by the frontend manager break; - case DEVICE_TYPE_802_11_WIRELESS: + case NM_DEVICE_TYPE_WIFI: createdInterface = new NMWirelessNetworkInterface(uni, this, 0); break; - case DEVICE_TYPE_GSM: + case NM_DEVICE_TYPE_GSM: createdInterface = new NMGsmNetworkInterface(uni, this, 0); break; - case DEVICE_TYPE_CDMA: + case NM_DEVICE_TYPE_CDMA: createdInterface = new NMCdmaNetworkInterface(uni, this, 0); break; /* diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.h --- kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.h.nm-09-compat 2011-04-30 08:41:40.275615895 +0200 +++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.h 2011-04-30 08:42:18.320140272 +0200 @@ -25,6 +25,27 @@ along with this program. If not, see <h #include <QDBusObjectPath> #include <kdemacros.h> +// for 0.8 compatibility reason +typedef enum NMState +{ + NM_STATE_UNKNOWN = 0, + NM_STATE_ASLEEP, + NM_STATE_CONNECTING, + NM_STATE_CONNECTED, + NM_STATE_DISCONNECTED +} NMState; + +typedef enum NMDeviceType +{ + NM_DEVICE_TYPE_UNKNOWN = 0, + NM_DEVICE_TYPE_ETHERNET, + NM_DEVICE_TYPE_WIFI, + NM_DEVICE_TYPE_GSM, + NM_DEVICE_TYPE_CDMA, + NM_DEVICE_TYPE_BT, /* Bluetooth */ + NM_DEVICE_TYPE_OLPC_MESH +} NMDeviceType; + class NMNetworkInterface; class NMNetworkManagerPrivate; ++++++ kdebase-workspace-4.6.2.tar.bz2 -> kdebase-workspace-4.6.3.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.6.2.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.6.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
