diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
| commit | a6ee13798647ec09fb33e316a90ef6ed0b7f314a (patch) | |
| tree | 815ded684a1ee9e4c23c2f03c98691b9272243c1 /extra/kdeplasma-applets-networkmanagement | |
| parent | c3b94090a6330f678ade2f767e76ab7802d3463e (diff) | |
| parent | 4d22176132f4a830ab0cc510dabbc9f8c1c362ea (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'extra/kdeplasma-applets-networkmanagement')
| -rw-r--r-- | extra/kdeplasma-applets-networkmanagement/nm-09.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/extra/kdeplasma-applets-networkmanagement/nm-09.patch b/extra/kdeplasma-applets-networkmanagement/nm-09.patch deleted file mode 100644 index 52b875513..000000000 --- a/extra/kdeplasma-applets-networkmanagement/nm-09.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Lamarque V. Souza <lamarque@gmail.com> -Date: Sun, 17 Apr 2011 00:09:43 +0000 -Subject: Fix compilation against NetworkManager-0.8.98. -X-Git-Url: http://quickgit.kde.org/?p=networkmanagement.git&a=commitdiff&h=e87ceccadc833e220f73d86352968655cedc0485 ---- -Fix compilation against NetworkManager-0.8.98. - -BUG: 271101 ---- - - ---- a/backends/NetworkManager/nmdbussettingsservice.cpp -+++ b/backends/NetworkManager/nmdbussettingsservice.cpp -@@ -59,7 +59,7 @@ public: - QHash<QUuid, QDBusObjectPath> uuidToPath; - }; - --const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String(NM_DBUS_SERVICE_USER_SETTINGS); -+const QString NMDBusSettingsService::SERVICE_USER_SETTINGS = QLatin1String("org.freedesktop.NetworkManagerUserSettings"); - const QString NMDBusSettingsService::SERVICE_SYSTEM_SETTINGS = QLatin1String("org.freedesktop.NetworkManager"); - - NMDBusSettingsService::NMDBusSettingsService(QObject * parent) - ---- a/backends/NetworkManager/settings/gsmdbus.cpp -+++ b/backends/NetworkManager/settings/gsmdbus.cpp -@@ -35,7 +35,7 @@ void GsmDbus::fromMap(const QVariantMap - 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>()); -@@ -62,7 +62,7 @@ QVariantMap GsmDbus::toMap() - 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()); - } - - |