packages: kde4-knetworkmanager/kde4-knetworkmanager.spec, kde4-knetworkmana...
cactus
cactus at pld-linux.org
Mon Apr 25 20:31:11 CEST 2011
Author: cactus Date: Mon Apr 25 18:31:11 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 0.9 snap 20110425
- BR: mobile-broadband-provider-info-devel
- patch0 - nm-09-compat.patch
---- Files affected:
packages/kde4-knetworkmanager:
kde4-knetworkmanager.spec (1.9 -> 1.10) , nm-09-compat.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/kde4-knetworkmanager/kde4-knetworkmanager.spec
diff -u packages/kde4-knetworkmanager/kde4-knetworkmanager.spec:1.9 packages/kde4-knetworkmanager/kde4-knetworkmanager.spec:1.10
--- packages/kde4-knetworkmanager/kde4-knetworkmanager.spec:1.9 Thu Jul 1 00:06:13 2010
+++ packages/kde4-knetworkmanager/kde4-knetworkmanager.spec Mon Apr 25 20:31:06 2011
@@ -3,19 +3,21 @@
# Conditional build:
%bcond_with verbose # verbose build
-%define snap 1144821
+%define snap 20110425
%define qtver 4.6.3
%define origname networkmanagement
Summary: Plasma applet that controls network via NetworkManager backend
Name: kde4-knetworkmanager
-Version: 4.4.5
+Epoch: 1
+Version: 0.9
Release: 0.%{snap}.1
License: GPL v2
Group: X11/Applications
-# svn co svn://anonsvn.kde.org/home/kde/trunk/kdereview/networkmanagement
+# git clone http://anongit.kde.org/networkmanagement
Source0: %{origname}-%{snap}.tar.gz
-# Source0-md5: c56a57a1166370091c9f0a67877ed032
+# Source0-md5: 6f6d757dc46398dd5ff3096f998bd5b9
+Patch0: nm-09-compat.patch
URL: http://en.opensuse.org/Projects/KNetworkManager
BuildRequires: NetworkManager-devel >= 0.7.1
BuildRequires: Qt3Support-devel >= %{qtver}
@@ -28,6 +30,7 @@
BuildRequires: cmake >= 2.8.0
BuildRequires: kde4-kdebase-workspace-devel >= %{version}
BuildRequires: kde4-kdelibs-devel >= %{version}
+BuildRequires: mobile-broadband-provider-info-devel
BuildRequires: qt4-build >= %{qtver}
BuildRequires: qt4-qmake >= %{qtver}
BuildRequires: rpmbuild(macros) >= 1.293
@@ -38,7 +41,8 @@
Plasma applet that controls network via NetworkManager backend.
%prep
-%setup -q -n %{origname}-%{snap}
+%setup -q -n %{origname}
+%patch0 -p1
%build
install -d build
@@ -71,7 +75,6 @@
%defattr(644,root,root,755)
%doc DESIGN TODO
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*.conf
-%attr(755,root,root) %{_bindir}/knetworkmanager
%attr(755,root,root) %ghost %{_libdir}/libknmclient.so.?
%attr(755,root,root) %{_libdir}/libknmclient.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libknminternals.so.?
@@ -87,24 +90,23 @@
%attr(755,root,root) %{_libdir}/libknmui.so
%attr(755,root,root) %{_libdir}/libsolidcontrolfuture.so
%attr(755,root,root) %{_libdir}/kde4/kcm_networkmanagement.so
-%attr(755,root,root) %{_libdir}/kde4/networkmanagement_openvpnui.so
-%attr(755,root,root) %{_libdir}/kde4/networkmanagement_vpncui.so
%attr(755,root,root) %{_libdir}/kde4/plasma_applet_networkmanagement.so
+%attr(755,root,root) %{_libdir}/kde4/plasma_engine_networkmanagement.so
%attr(755,root,root) %{_libdir}/kde4/libexec/networkmanagement_configshell
%attr(755,root,root) %{_libdir}/kde4/kcm_networkmanagement_tray.so
%attr(755,root,root) %{_libdir}/kde4/kded_networkmanagement.so
%attr(755,root,root) %{_libdir}/kde4/networkmanagement_novellvpnui.so
+%attr(755,root,root) %{_libdir}/kde4/networkmanagement_openvpnui.so
%attr(755,root,root) %{_libdir}/kde4/networkmanagement_pptpui.so
%attr(755,root,root) %{_libdir}/kde4/networkmanagement_strongswanui.so
+%attr(755,root,root) %{_libdir}/kde4/networkmanagement_vpncui.so
%{_datadir}/apps/networkmanagement
%{_datadir}/kde4/services/*.desktop
%{_datadir}/kde4/services/kded/*.desktop
%{_datadir}/kde4/servicetypes/*.desktop
-%{_desktopdir}/kde4/knetworkmanager.desktop
%{_iconsdir}/oxygen/*x*/devices/network-wireless*.png
%{_iconsdir}/oxygen/*x*/devices/network-wired-activated.png
%{_iconsdir}/oxygen/*x*/devices/network-defaultroute.png
-%{_iconsdir}/hicolor/32x32/apps/knetworkmanager.png
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -112,6 +114,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2011/04/25 18:31:06 cactus
+- up to 0.9 snap 20110425
+- BR: mobile-broadband-provider-info-devel
+- patch0 - nm-09-compat.patch
+
Revision 1.9 2010/06/30 22:06:13 shadzik
- snap 1144821
- fake version 4.4.5
================================================================
Index: packages/kde4-knetworkmanager/nm-09-compat.patch
diff -u /dev/null packages/kde4-knetworkmanager/nm-09-compat.patch:1.1
--- /dev/null Mon Apr 25 20:31:11 2011
+++ packages/kde4-knetworkmanager/nm-09-compat.patch Mon Apr 25 20:31:06 2011
@@ -0,0 +1,256 @@
+diff -ur networkmanagement-orig/backends/NetworkManager/busconnection.h networkmanagement-0.9/backends/NetworkManager/busconnection.h
+--- networkmanagement-orig/backends/NetworkManager/busconnection.h 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/busconnection.h 2011-04-20 14:53:34.895397075 +0200
+@@ -51,9 +51,9 @@
+ class BusConnection : public QObject
+ {
+ Q_OBJECT
+- Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManagerSettings.Connection")
++ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManager.Settings.Connection")
+ // Can QtDbus handle multiple interfaces being provided by one object like this?
+- Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManagerSettings.Connection.Secrets")
++ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManager.Settings.Connection.Secrets")
+
+ public:
+ /**
+diff -ur networkmanagement-orig/backends/NetworkManager/exportedconnection.h networkmanagement-0.9/backends/NetworkManager/exportedconnection.h
+--- networkmanagement-orig/backends/NetworkManager/exportedconnection.h 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/exportedconnection.h 2011-04-20 14:53:34.895397075 +0200
+@@ -30,9 +30,9 @@
+ class ConnectionAdaptor: public QDBusAbstractAdaptor
+ {
+ Q_OBJECT
+- Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManagerSettings.Connection")
++ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManager.Settings.Connection")
+ Q_CLASSINFO("D-Bus Introspection", ""
+-" <interface name=\"org.freedesktop.NetworkManagerSettings.Connection\">\n"
++" <interface name=\"org.freedesktop.NetworkManager.Settings.Connection\">\n"
+ " <method name=\"Update\">\n"
+ " <annotation value=\"impl_exported_connection_update\" name=\"org.freedesktop.DBus.GLib.CSymbol\"/>\n"
+ " <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
+diff -ur networkmanagement-orig/backends/NetworkManager/exportedconnectionsecrets.h networkmanagement-0.9/backends/NetworkManager/exportedconnectionsecrets.h
+--- networkmanagement-orig/backends/NetworkManager/exportedconnectionsecrets.h 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/exportedconnectionsecrets.h 2011-04-20 14:53:34.895397075 +0200
+@@ -30,9 +30,9 @@
+ class SecretsAdaptor: public QDBusAbstractAdaptor
+ {
+ Q_OBJECT
+- Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManagerSettings.Connection.Secrets")
++ Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManager.Settings.Connection.Secrets")
+ Q_CLASSINFO("D-Bus Introspection", ""
+-" <interface name=\"org.freedesktop.NetworkManagerSettings.Connection.Secrets\">\n"
++" <interface name=\"org.freedesktop.NetworkManager.Settings.Connection.Secrets\">\n"
+ " <method name=\"GetSecrets\">\n"
+ " <annotation value=\"impl_exported_connection_get_secrets\" name=\"org.freedesktop.DBus.GLib.CSymbol\"/>\n"
+ " <annotation value=\"\" name=\"org.freedesktop.DBus.GLib.Async\"/>\n"
+diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-active-connection.xml networkmanagement-0.9/backends/NetworkManager/introspection/nm-active-connection.xml
+--- networkmanagement-orig/backends/NetworkManager/introspection/nm-active-connection.xml 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/introspection/nm-active-connection.xml 2011-04-20 14:53:34.895397075 +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 -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-connection-secrets.xml networkmanagement-0.9/backends/NetworkManager/introspection/nm-connection-secrets.xml
+--- networkmanagement-orig/backends/NetworkManager/introspection/nm-connection-secrets.xml 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/introspection/nm-connection-secrets.xml 2011-04-20 14:53:34.895397075 +0200
+@@ -2,7 +2,7 @@
+
+ <node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+
+- <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 -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-exported-connection.xml networkmanagement-0.9/backends/NetworkManager/introspection/nm-exported-connection.xml
+--- networkmanagement-orig/backends/NetworkManager/introspection/nm-exported-connection.xml 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/introspection/nm-exported-connection.xml 2011-04-20 14:53:34.895397075 +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>
+diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-settings.xml networkmanagement-0.9/backends/NetworkManager/introspection/nm-settings.xml
+--- networkmanagement-orig/backends/NetworkManager/introspection/nm-settings.xml 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/introspection/nm-settings.xml 2011-04-20 14:53:34.896397057 +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 -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-vpn-connection.xml networkmanagement-0.9/backends/NetworkManager/introspection/nm-vpn-connection.xml
+--- networkmanagement-orig/backends/NetworkManager/introspection/nm-vpn-connection.xml 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/introspection/nm-vpn-connection.xml 2011-04-20 14:53:34.896397057 +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.VPN.Connection">
++ <interface name="org.freedesktop.NetworkManagerCompat.VPN.Connection">
+ <tp:docstring>
+ Represents an active connection to a Virtual Private Network.
+ </tp:docstring>
+diff -ur networkmanagement-orig/backends/NetworkManager/nm-active-connectioninterface.h networkmanagement-0.9/backends/NetworkManager/nm-active-connectioninterface.h
+--- networkmanagement-orig/backends/NetworkManager/nm-active-connectioninterface.h 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/nm-active-connectioninterface.h 2011-04-20 16:49:16.302308474 +0200
+@@ -29,7 +29,7 @@
+ Q_OBJECT
+ public:
+ static inline const char *staticInterfaceName()
+- { return "org.freedesktop.NetworkManager.Connection.Active"; }
++ { return "org.freedesktop.NetworkManagerCompat.Connection.Active"; }
+
+ public:
+ OrgFreedesktopNetworkManagerConnectionActiveInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+diff -ur networkmanagement-orig/backends/NetworkManager/nmdbussettingsservice.cpp networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.cpp
+--- networkmanagement-orig/backends/NetworkManager/nmdbussettingsservice.cpp 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.cpp 2011-04-20 14:53:34.894397093 +0200
+@@ -57,6 +57,9 @@
+ QHash<QUuid, QDBusObjectPath> uuidToPath;
+ };
+
++#define NM_DBUS_SERVICE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings"
++#define NM_DBUS_SERVICE_SYSTEM_SETTINGS "org.freedesktop.NetworkManagerSystemSettings"
++
+ const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS);
+ const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String(NM_DBUS_SERVICE_SYSTEM_SETTINGS);
+
+diff -ur networkmanagement-orig/backends/NetworkManager/nmdbussettingsservice.h networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.h
+--- networkmanagement-orig/backends/NetworkManager/nmdbussettingsservice.h 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.h 2011-04-20 14:53:34.896397057 +0200
+@@ -43,7 +43,7 @@
+ class KNM_EXPORT NMDBusSettingsService : public QObject, public ActivatableObserver, public ConnectionHandler
+ {
+ Q_OBJECT
+-Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManagerSettings")
++Q_CLASSINFO("D-Bus Interface", "org.freedesktop.NetworkManager.Settings")
+
+ public:
+ enum ServiceStatus { Available, AlreadyRunning, AccessDenied, UnknownError };
+diff -ur networkmanagement-orig/backends/NetworkManager/nm-exported-connectioninterface.h networkmanagement-0.9/backends/NetworkManager/nm-exported-connectioninterface.h
+--- networkmanagement-orig/backends/NetworkManager/nm-exported-connectioninterface.h 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/nm-exported-connectioninterface.h 2011-04-20 14:53:34.896397057 +0200
+@@ -29,7 +29,7 @@
+ 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);
+diff -ur networkmanagement-orig/backends/NetworkManager/nm-exported-connection-secrets-interface.h networkmanagement-0.9/backends/NetworkManager/nm-exported-connection-secrets-interface.h
+--- networkmanagement-orig/backends/NetworkManager/nm-exported-connection-secrets-interface.h 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/nm-exported-connection-secrets-interface.h 2011-04-20 16:49:56.551556038 +0200
+@@ -29,7 +29,7 @@
+ 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 -ur networkmanagement-orig/backends/NetworkManager/nm-settingsinterface.h networkmanagement-0.9/backends/NetworkManager/nm-settingsinterface.h
+--- networkmanagement-orig/backends/NetworkManager/nm-settingsinterface.h 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/nm-settingsinterface.h 2011-04-20 14:53:34.896397057 +0200
+@@ -29,7 +29,7 @@
+ Q_OBJECT
+ public:
+ static inline const char *staticInterfaceName()
+- { return "org.freedesktop.NetworkManagerSettings"; }
++ { return "org.freedesktop.NetworkManager.Settings"; }
+
+ public:
+ OrgFreedesktopNetworkManagerSettingsInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+diff -ur networkmanagement-orig/backends/NetworkManager/nm-vpn-connectioninterface.h networkmanagement-0.9/backends/NetworkManager/nm-vpn-connectioninterface.h
+--- networkmanagement-orig/backends/NetworkManager/nm-vpn-connectioninterface.h 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/nm-vpn-connectioninterface.h 2011-04-20 16:52:07.726103441 +0200
+@@ -28,7 +28,7 @@
+ 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 -ur networkmanagement-orig/backends/NetworkManager/settings/gsmdbus.cpp networkmanagement-0.9/backends/NetworkManager/settings/gsmdbus.cpp
+--- networkmanagement-orig/backends/NetworkManager/settings/gsmdbus.cpp 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/backends/NetworkManager/settings/gsmdbus.cpp 2011-04-20 14:53:34.894397093 +0200
+@@ -35,7 +35,7 @@
+ if (map.contains(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE))) {
+ setting->setNetworktype(map.value(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE)).value<int>());
+ } else {
+- setting->setNetworktype(NM_GSM_NETWORK_ANY);
++ setting->setNetworktype(NM_SETTING_GSM_NETWORK_TYPE_ANY);
+ }
+ if (map.contains("band")) {
+ setting->setBand(map.value("band").value<int>());
+@@ -58,7 +58,7 @@
+ map.insert("apn", setting->apn());
+ if (!setting->networkid().isEmpty())
+ map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid());
+- if (setting->networktype() != NM_GSM_NETWORK_ANY) {
++ if (setting->networktype() != NM_SETTING_GSM_NETWORK_TYPE_ANY) {
+ map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_TYPE), setting->networktype());
+ }
+
+Pouze v networkmanagement-0.9/backends/NetworkManager/settings: gsmdbus.cpp.orig
+diff -ur networkmanagement-orig/NetworkManager-kde4.conf networkmanagement-0.9/NetworkManager-kde4.conf
+--- networkmanagement-orig/NetworkManager-kde4.conf 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/NetworkManager-kde4.conf 2011-04-20 14:53:34.896397057 +0200
+@@ -14,23 +14,23 @@
+ <allow own="org.freedesktop.NetworkManagerUserSettings"/>
+
+ <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
+- send_interface="org.freedesktop.NetworkManagerSettings"/>
++ send_interface="org.freedesktop.NetworkManager.Settings"/>
+
+ <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
+- send_interface="org.freedesktop.NetworkManagerSettings.Connection"/>
++ send_interface="org.freedesktop.NetworkManager.Settings.Connection"/>
+
+ <!-- Only root can get secrets -->
+ <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
+- send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/>
++ send_interface="org.freedesktop.NetworkManager.Settings.Connection.Secrets"/>
+ </policy>
+ <policy at_console="true">
+ <allow own="org.freedesktop.NetworkManagerUserSettings"/>
+
+ <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
+- send_interface="org.freedesktop.NetworkManagerSettings"/>
++ send_interface="org.freedesktop.NetworkManager.Settings"/>
+
+ <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
+- send_interface="org.freedesktop.NetworkManagerSettings.Connection"/>
++ send_interface="org.freedesktop.NetworkManager.Settings.Connection"/>
+ </policy>
+ <policy context="default">
+ <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
+diff -ur networkmanagement-orig/settings/config/manageconnectionwidget.cpp networkmanagement-0.9/settings/config/manageconnectionwidget.cpp
+--- networkmanagement-orig/settings/config/manageconnectionwidget.cpp 2011-04-20 13:36:45.000000000 +0200
++++ networkmanagement-0.9/settings/config/manageconnectionwidget.cpp 2011-04-20 14:53:34.894397093 +0200
+@@ -59,6 +59,9 @@
+ #define ConnectionLastUsedRole Qt::UserRole + 3
+ #define ConnectionScopeRole Qt::UserRole + 4
+
++#define NM_DBUS_SERVICE_USER_SETTINGS "org.freedesktop.NetworkManagerUserSettings"
++#define NM_DBUS_SERVICE_SYSTEM_SETTINGS "org.freedesktop.NetworkManagerSystemSettings"
++
+ K_PLUGIN_FACTORY( ManageConnectionWidgetFactory, registerPlugin<ManageConnectionWidget>();)
+ K_EXPORT_PLUGIN( ManageConnectionWidgetFactory( "kcm_networkmanagement", "libknetworkmanager" ) )
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-knetworkmanager/kde4-knetworkmanager.spec?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list