[kde-plasma-networkmanagement/f15/master] * Sat Apr 30 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.47.20110323 - revert to the 20110323
Kevin Kofler
kkofler at fedoraproject.org
Sat Apr 30 13:26:06 UTC 2011
commit 77107151a6691bea311aba48156337e158ad2774
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Sat Apr 30 15:25:41 2011 +0200
* Sat Apr 30 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.47.20110323
- revert to the 20110323 snapshot (newer features not supported in F15)
kde-plasma-networkmanagement.spec | 7 ++-
nm-09-compat.patch | 124 +++++++++++++++++--------------------
sources | 2 -
3 files changed, 61 insertions(+), 72 deletions(-)
---
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 250fdcb..2df35f0 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -1,5 +1,5 @@
-%define snap 20110420
+%define snap 20110323
%if 0%{?fedora} > 14
%global nm09 1
@@ -8,7 +8,7 @@
Name: kde-plasma-networkmanagement
Epoch: 1
Version: 0.9
-Release: 0.46.%{snap}%{?dist}
+Release: 0.47.%{snap}%{?dist}
Summary: NetworkManager KDE 4 integration
Group: Applications/Internet
@@ -214,6 +214,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%changelog
+* Sat Apr 30 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.47.20110323
+- revert to the 20110323 snapshot (newer features not supported in F15)
+
* Wed Apr 20 2011 Lukas Tinkl <ltinkl at redhat.com> - 1:0.9-0.46.20110419
- fix VPN connections on the compat interface
diff --git a/nm-09-compat.patch b/nm-09-compat.patch
index 00040a0..515c95c 100644
--- a/nm-09-compat.patch
+++ b/nm-09-compat.patch
@@ -1,6 +1,6 @@
-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
+diff -ur networkmanagement-0.9/backends/NetworkManager/busconnection.h networkmanagement-0.9-compat/backends/NetworkManager/busconnection.h
+--- networkmanagement-0.9/backends/NetworkManager/busconnection.h 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/busconnection.h 2011-04-30 15:10:48.000000000 +0200
@@ -51,9 +51,9 @@
class BusConnection : public QObject
{
@@ -13,9 +13,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/busconnection.h networkm
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
+diff -ur networkmanagement-0.9/backends/NetworkManager/exportedconnection.h networkmanagement-0.9-compat/backends/NetworkManager/exportedconnection.h
+--- networkmanagement-0.9/backends/NetworkManager/exportedconnection.h 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/exportedconnection.h 2011-04-30 15:10:48.000000000 +0200
@@ -30,9 +30,9 @@
class ConnectionAdaptor: public QDBusAbstractAdaptor
{
@@ -28,9 +28,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/exportedconnection.h net
" <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
+diff -ur networkmanagement-0.9/backends/NetworkManager/exportedconnectionsecrets.h networkmanagement-0.9-compat/backends/NetworkManager/exportedconnectionsecrets.h
+--- networkmanagement-0.9/backends/NetworkManager/exportedconnectionsecrets.h 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/exportedconnectionsecrets.h 2011-04-30 15:10:48.000000000 +0200
@@ -30,9 +30,9 @@
class SecretsAdaptor: public QDBusAbstractAdaptor
{
@@ -43,9 +43,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/exportedconnectionsecret
" <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
+diff -ur networkmanagement-0.9/backends/NetworkManager/introspection/nm-active-connection.xml networkmanagement-0.9-compat/backends/NetworkManager/introspection/nm-active-connection.xml
+--- networkmanagement-0.9/backends/NetworkManager/introspection/nm-active-connection.xml 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/introspection/nm-active-connection.xml 2011-04-30 15:10:48.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
@@ -55,9 +55,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-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
+diff -ur networkmanagement-0.9/backends/NetworkManager/introspection/nm-connection-secrets.xml networkmanagement-0.9-compat/backends/NetworkManager/introspection/nm-connection-secrets.xml
+--- networkmanagement-0.9/backends/NetworkManager/introspection/nm-connection-secrets.xml 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/introspection/nm-connection-secrets.xml 2011-04-30 15:10:48.000000000 +0200
@@ -2,7 +2,7 @@
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
@@ -67,9 +67,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-connect
<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
+diff -ur networkmanagement-0.9/backends/NetworkManager/introspection/nm-exported-connection.xml networkmanagement-0.9-compat/backends/NetworkManager/introspection/nm-exported-connection.xml
+--- networkmanagement-0.9/backends/NetworkManager/introspection/nm-exported-connection.xml 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/introspection/nm-exported-connection.xml 2011-04-30 15:10:48.000000000 +0200
@@ -2,7 +2,7 @@
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
@@ -79,9 +79,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-exporte
<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
+diff -ur networkmanagement-0.9/backends/NetworkManager/introspection/nm-settings.xml networkmanagement-0.9-compat/backends/NetworkManager/introspection/nm-settings.xml
+--- networkmanagement-0.9/backends/NetworkManager/introspection/nm-settings.xml 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/introspection/nm-settings.xml 2011-04-30 15:10:48.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
@@ -91,9 +91,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-setting
<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
+diff -ur networkmanagement-0.9/backends/NetworkManager/introspection/nm-vpn-connection.xml networkmanagement-0.9-compat/backends/NetworkManager/introspection/nm-vpn-connection.xml
+--- networkmanagement-0.9/backends/NetworkManager/introspection/nm-vpn-connection.xml 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/introspection/nm-vpn-connection.xml 2011-04-30 15:10:48.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
@@ -103,9 +103,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/introspection/nm-vpn-con
<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
+diff -ur networkmanagement-0.9/backends/NetworkManager/nm-active-connectioninterface.h networkmanagement-0.9-compat/backends/NetworkManager/nm-active-connectioninterface.h
+--- networkmanagement-0.9/backends/NetworkManager/nm-active-connectioninterface.h 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/nm-active-connectioninterface.h 2011-04-30 15:18:54.000000000 +0200
@@ -29,7 +29,7 @@
Q_OBJECT
public:
@@ -115,9 +115,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/nm-active-connectioninte
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
+diff -ur networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.cpp networkmanagement-0.9-compat/backends/NetworkManager/nmdbussettingsservice.cpp
+--- networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.cpp 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/nmdbussettingsservice.cpp 2011-04-30 15:10:48.000000000 +0200
@@ -57,6 +57,9 @@
QHash<QUuid, QDBusObjectPath> uuidToPath;
};
@@ -128,9 +128,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/nmdbussettingsservice.cp
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
+diff -ur networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.h networkmanagement-0.9-compat/backends/NetworkManager/nmdbussettingsservice.h
+--- networkmanagement-0.9/backends/NetworkManager/nmdbussettingsservice.h 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/nmdbussettingsservice.h 2011-04-30 15:10:48.000000000 +0200
@@ -43,7 +43,7 @@
class KNM_EXPORT NMDBusSettingsService : public QObject, public ActivatableObserver, public ConnectionHandler
{
@@ -140,9 +140,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/nmdbussettingsservice.h
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
+diff -ur networkmanagement-0.9/backends/NetworkManager/nm-exported-connectioninterface.h networkmanagement-0.9-compat/backends/NetworkManager/nm-exported-connectioninterface.h
+--- networkmanagement-0.9/backends/NetworkManager/nm-exported-connectioninterface.h 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/nm-exported-connectioninterface.h 2011-04-30 15:10:48.000000000 +0200
@@ -29,7 +29,7 @@
Q_OBJECT
public:
@@ -152,21 +152,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/nm-exported-connectionin
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
+diff -ur networkmanagement-0.9/backends/NetworkManager/nm-settingsinterface.h networkmanagement-0.9-compat/backends/NetworkManager/nm-settingsinterface.h
+--- networkmanagement-0.9/backends/NetworkManager/nm-settingsinterface.h 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/nm-settingsinterface.h 2011-04-30 15:10:48.000000000 +0200
@@ -29,7 +29,7 @@
Q_OBJECT
public:
@@ -176,9 +164,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/nm-settingsinterface.h n
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
+diff -ur networkmanagement-0.9/backends/NetworkManager/nm-vpn-connectioninterface.h networkmanagement-0.9-compat/backends/NetworkManager/nm-vpn-connectioninterface.h
+--- networkmanagement-0.9/backends/NetworkManager/nm-vpn-connectioninterface.h 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/nm-vpn-connectioninterface.h 2011-04-30 15:19:40.000000000 +0200
@@ -28,7 +28,7 @@
Q_OBJECT
public:
@@ -188,9 +176,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/nm-vpn-connectioninterfa
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
+diff -ur networkmanagement-0.9/backends/NetworkManager/settings/gsmdbus.cpp networkmanagement-0.9-compat/backends/NetworkManager/settings/gsmdbus.cpp
+--- networkmanagement-0.9/backends/NetworkManager/settings/gsmdbus.cpp 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/backends/NetworkManager/settings/gsmdbus.cpp 2011-04-30 15:10:48.000000000 +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>());
@@ -200,7 +188,7 @@ diff -ur networkmanagement-orig/backends/NetworkManager/settings/gsmdbus.cpp net
}
if (map.contains("band")) {
setting->setBand(map.value("band").value<int>());
-@@ -58,7 +58,7 @@
+@@ -62,7 +62,7 @@
map.insert("apn", setting->apn());
if (!setting->networkid().isEmpty())
map.insert(QLatin1String(NM_SETTING_GSM_NETWORK_ID), setting->networkid());
@@ -209,10 +197,9 @@ diff -ur networkmanagement-orig/backends/NetworkManager/settings/gsmdbus.cpp net
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
+diff -ur networkmanagement-0.9/NetworkManager-kde4.conf networkmanagement-0.9-compat/NetworkManager-kde4.conf
+--- networkmanagement-0.9/NetworkManager-kde4.conf 2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-compat/NetworkManager-kde4.conf 2011-04-30 15:10:48.000000000 +0200
@@ -14,23 +14,23 @@
<allow own="org.freedesktop.NetworkManagerUserSettings"/>
@@ -242,15 +229,16 @@ diff -ur networkmanagement-orig/NetworkManager-kde4.conf networkmanagement-0.9/N
</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
+diff -ur networkmanagement-0.9/settings/config/manageconnectionwidget.cpp networkmanagement-0.9-compat/settings/config/manageconnectionwidget.cpp
+--- networkmanagement-0.9/settings/config/manageconnectionwidget.cpp 2011-03-23 19:15:36.000000000 +0100
++++ networkmanagement-0.9-compat/settings/config/manageconnectionwidget.cpp 2011-04-30 15:10:48.000000000 +0200
+@@ -57,6 +57,9 @@
+ #define ConnectionTypeRole 1066
+ #define ConnectionLastUsedRole 1848
+#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" ) )
+
diff --git a/sources b/sources
index 7b3d0b8..4f49967 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
2c40c0d6b0dd7761aec891af8dbadb07 networkmanagement-0.9-20110323.tar.bz2
-c71b3abb6710aca44cb320abf3c73e9a networkmanagement-0.9-20110419.tar.bz2
-ea0a507bc662b9c5ded34ee6a9e72672 networkmanagement-0.9-20110420.tar.bz2
More information about the scm-commits
mailing list