[kde-plasma-networkmanagement] * Sat Oct 22 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.62.beta1.nm09 - fix plasma-desktop c

[Kevin Kofler]

commit ad024ae8aa042e2dd568f1c15512582550da1adf
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Oct 23 00:52:35 2011 +0200

    * Sat Oct 22 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.62.beta1.nm09
    - fix plasma-desktop crash after installing updates with apper (kde#284743)

 ...lasma-networkmanagement-0.8.80-kde#284743.patch |   31 ++++++++++++++++++++
 kde-plasma-networkmanagement.spec                  |   12 +++++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/kde-plasma-networkmanagement-0.8.80-kde#284743.patch b/kde-plasma-networkmanagement-0.8.80-kde#284743.patch
new file mode 100644
index 0000000..a37ba6d
--- /dev/null
+++ b/kde-plasma-networkmanagement-0.8.80-kde#284743.patch
@@ -0,0 +1,31 @@
+commit cd8c45b09d3cb7fd1a3111718802941fd947dfd3
+Author: Lamarque V. Souza <lamarque at kde.org>
+Date:   Sat Oct 22 20:18:23 2011 -0200
+
+    Reset pointers on NM's start / stop state changes.
+    
+    BUG: 284743
+
+diff --git a/applet/networkmanager.cpp b/applet/networkmanager.cpp
+index 11ad864..1926649 100644
+--- a/applet/networkmanager.cpp
++++ b/applet/networkmanager.cpp
+@@ -851,10 +851,15 @@ void NetworkManagerApplet::userWirelessEnabledChanged(bool enabled)
+ void NetworkManagerApplet::managerStatusChanged(Solid::Networking::Status status)
+ {
+     //kDebug() << "managerstatuschanged";
+-    if (Solid::Networking::Unknown == status ) {
+-        // FIXME: Do something smart
++    m_interfaces = Solid::Control::NetworkManagerNm09::networkInterfaces();
++    if (status == Solid::Networking::Unknown) {
++        m_activeInterface = m_activeSystrayInterface = 0;
+     } else {
+-        // ...
++        if (!m_interfaces.isEmpty()) {
++            qSort(m_interfaces.begin(), m_interfaces.end(), networkInterfaceLessThan);
++            m_activeInterface = m_interfaces.first();
++            m_activeSystrayInterface = m_activeInterface;
++        }
+     }
+     setupInterfaceSignals();
+     updatePixmap();
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 7c313fe..81f4dc7 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -5,7 +5,7 @@
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.61.%{beta}.nm09%{?dist}
+Release:        0.62.%{beta}.nm09%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -18,6 +18,12 @@ Source0:        ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/%{tarballve
 # Add plasma-nm to default systray if needed, for upgraders...
 Source10: 00-fedora-networkmanagement.js
 
+# Upstream patches
+# fix plasma-desktop crash after installing updates with apper (kde#284743)
+# http://commits.kde.org/networkmanagement/cd8c45b09d3cb7fd1a3111718802941fd947dfd3
+# (went in AFTER 0.8.90 / 0.9 beta 2)
+Patch100:       kde-plasma-networkmanagement-0.8.80-kde#284743.patch
+
 BuildRequires:  kdelibs4-devel >= 4.5.0
 BuildRequires:  kdebase-workspace-devel
 # really just a runtime dep, meh -- Rex
@@ -97,6 +103,7 @@ Requires:       NetworkManager-openconnect
 
 %prep
 %setup -q -n networkmanagement-%{tarballversion}
+%patch100 -p1 -b .kde#284743
 
 # nuke monolithic knm bits
 rm -rfv monolithic po/*/knetworkmanager.po
@@ -216,6 +223,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Sat Oct 22 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.62.beta1.nm09
+- fix plasma-desktop crash after installing updates with apper (kde#284743)
+
 * Sat Oct 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.61.beta1.nm09
 - fill in full URL for Source0