[kde-plasma-networkmanagement/f15] * Wed Jun 06 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.47.20110323.1 - fix missing NULL che

[Kevin Kofler]

commit 95a82f0c0a131b3cba5a8c6a981e0c5e5b774722
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Jun 8 14:07:16 2011 +0200

    * Wed Jun 06 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.47.20110323.1
    - fix missing NULL checks (#710996, backported from upstream git)

 kde-plasma-networkmanagement.spec            |    9 ++++++++-
 networkmanagement-0.9-20110323-#710996.patch |   23 +++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 2df35f0..f9006a9 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -8,7 +8,7 @@
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.47.%{snap}%{?dist}
+Release:        0.47.%{snap}%{?dist}.1
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -29,6 +29,9 @@ Patch0: nm-09-compat.patch
 ## upstreamable patches
 
 ## upstream patches
+# fix missing NULL checks (#710996)
+# backported from upstream git (rev ff9076fe85f31b0cfa388d92a0c6d288ad07f396)
+Patch100: networkmanagement-0.9-20110323-#710996.patch
 
 BuildRequires:  kdelibs4-devel >= 4.5.0
 BuildRequires:  kdebase-workspace-devel
@@ -106,6 +109,7 @@ Provides:       knetworkmanager-vpnc = %{?epoch:%{epoch}:}%{version}-%{release}
 %if 0%{?nm09}
 %patch0 -p1 -b .nm09-compat
 %endif
+%patch100 -p1 -b .#710996
 
 # nuke monolithic knm bits
 rm -rfv monolithic po/*/knetworkmanager.po
@@ -214,6 +218,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Wed Jun 06 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.47.20110323.1
+- fix missing NULL checks (#710996, backported from upstream git)
+
 * 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)
 
diff --git a/networkmanagement-0.9-20110323-#710996.patch b/networkmanagement-0.9-20110323-#710996.patch
new file mode 100644
index 0000000..891c281
--- /dev/null
+++ b/networkmanagement-0.9-20110323-#710996.patch
@@ -0,0 +1,23 @@
+diff -ur networkmanagement-0.9/applet/nmpopup.cpp networkmanagement-0.9-#710996/applet/nmpopup.cpp
+--- networkmanagement-0.9/applet/nmpopup.cpp	2011-03-23 19:15:35.000000000 +0100
++++ networkmanagement-0.9-#710996/applet/nmpopup.cpp	2011-06-08 14:00:47.000000000 +0200
+@@ -533,7 +533,7 @@
+ 
+     foreach (InterfaceItem* ifaceitem, m_interfaces) {
+         Solid::Control::NetworkInterface* iface = ifaceitem->interface();
+-        if (iface->type() == Solid::Control::NetworkInterface::Ieee80211) {
++        if (iface && iface->type() == Solid::Control::NetworkInterface::Ieee80211) {
+             //kDebug() << "there's a wifi iface" << ifaceitem->connectionName() << iface->interfaceName();
+             m_hasWirelessInterface = true; // at least one interface is wireless. We're happy.
+             m_wifiCheckBox->show();
+@@ -554,8 +554,8 @@
+     bool hasWwan = false;
+     foreach (InterfaceItem* ifaceitem, m_interfaces) {
+         Solid::Control::NetworkInterface* iface = ifaceitem->interface();
+-        if (iface->type() == Solid::Control::NetworkInterface::Gsm ||
+-            iface->type() == Solid::Control::NetworkInterface::Cdma) {
++        if (iface && (iface->type() == Solid::Control::NetworkInterface::Gsm ||
++                      iface->type() == Solid::Control::NetworkInterface::Cdma)) {
+             hasWwan = true;
+             break;
+         }