[meego-commits] 8722: Changes to MeeGo:1.1:Handset:Testing/meegotouchcp-connman

[Kaitlin Rupert]

Hi,
I have made the following changes to meegotouchcp-connman in project MeeGo:1.1:Handset:Testing. Please review and accept ASAP.

Thank You,
Kaitlin Rupert

[This message was auto-generated]

---

Request #8722:

  submit:   home:krupert:branches:home:mikeleib:branches:MeeGo:1.1:Handset:Testing/meegotouchcp-connman(r3) -> MeeGo:1.1:Handset:Testing/meegotouchcp-connman


Message:
    * Thu Oct 21 2010 Katilin Rupert <kaitlin.rupert at intel.com> - 0.0.13
- Add a fix for a potiential race condition during compile time.
* Thu Oct 21 2010 Michael Leibowitz <michael.leibowitz at intel.com> - 0.0.13
- Added 0002-Fix-BMC-8575-ASSERT-row-1-in-file-networklistmodel.c.patch
  Fixed:
   - BMC#8575 - ASSERT: "row != -1" in file networklistmodel.cpp, line 278 causing sysuid and connectivity control panel crash

State:   new          2010-10-21T12:09:48 krupert
Comment: None



changes files:
--------------
--- meegotouchcp-connman.changes
+++ meegotouchcp-connman.changes
@@ -0,0 +1,8 @@
+* Thu Oct 21 2010 Katilin Rupert <kaitlin.rupert at intel.com> - 0.0.13
+- Add a fix for a potiential race condition during compile time.
+
+* Thu Oct 21 2010 Michael Leibowitz <michael.leibowitz at intel.com> - 0.0.13
+- Added 0002-Fix-BMC-8575-ASSERT-row-1-in-file-networklistmodel.c.patch
+  Fixed:
+   - BMC#8575 - ASSERT: "row != -1" in file networklistmodel.cpp, line 278 causing sysuid and connectivity control panel crash
+

new:
----
  0002-Fix-BMC-8575-ASSERT-row-1-in-file-networklistmodel.c.patch
  add_config_ordered.patch

spec files:
-----------
--- meegotouchcp-connman.spec
+++ meegotouchcp-connman.spec
@@ -1,6 +1,6 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.20
 # 
 # >> macros
 # << macros
@@ -15,6 +15,7 @@
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  meegotouchcp-connman.yaml
 Patch0:     0001-Fix-BMC-811-and-BMC-3397.patch
+Patch1:     0002-Fix-BMC-8575-ASSERT-row-1-in-file-networklistmodel.c.patch
 Requires:   connman
 Requires:   meego-handset-cpwifi-branding
 BuildRequires:  pkgconfig(QtCore) >= 4.6.0
@@ -68,6 +69,8 @@
 
 # 0001-Fix-BMC-811-and-BMC-3397.patch
 %patch0 -p1
+# 0002-Fix-BMC-8575-ASSERT-row-1-in-file-networklistmodel.c.patch
+%patch1 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ 0002-Fix-BMC-8575-ASSERT-row-1-in-file-networklistmodel.c.patch (new)
--- 0002-Fix-BMC-8575-ASSERT-row-1-in-file-networklistmodel.c.patch
+++ 0002-Fix-BMC-8575-ASSERT-row-1-in-file-networklistmodel.c.patch
+From 6320316cae5c1127f9c6a83cb8d177a7ae397a9c Mon Sep 17 00:00:00 2001
+From: Michael Leibowitz <michael.leibowitz at intel.com>
+Date: Thu, 21 Oct 2010 09:42:43 -0700
+Subject: [PATCH 2/2] Fix BMC#8575 - ASSERT: "row != -1" in file networklistmodel.cpp, line 278 causing sysuid and connectivity control panel crash
+
+This basically just steps around the problem by changing an ASSERT
+into a qCritical.
+
+Signed-off-by: Michael Leibowitz <michael.leibowitz at intel.com>
+---
+ libconnman-qt/networklistmodel.cpp |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/libconnman-qt/networklistmodel.cpp b/libconnman-qt/networklistmodel.cpp
+index ec49901..0bb095e 100644
+--- a/libconnman-qt/networklistmodel.cpp
++++ b/libconnman-qt/networklistmodel.cpp
+@@ -275,8 +275,11 @@ void NetworkListModel::propertyChanged(const QString &name,
+    if (members.contains(NetworkItemModel::Type))
+      {
+        int row = m_networks.indexOf(static_cast<NetworkItemModel*>(sender()));
+-       Q_ASSERT(row != -1);
+-       emit dataChanged(createIndex(row, 0), createIndex(row, 1));
++       if (-1 == row) {
++	 qCritical() << "couldn't find the modified networkItemModel that was modified in the list";
++       } else {
++	 emit dataChanged(createIndex(row, 0), createIndex(row, 1));
++       }
+      }
+  }
+ 
+-- 
+1.7.2.2
+

++++++ add_config_ordered.patch (new)
--- add_config_ordered.patch
+++ add_config_ordered.patch
+From: Kaitlin Rupert <kaitlin.rupert at intel.com>
+Date: Thu, Oct 21 2010
+Subject: [PATCH] Fix potiential build failure
+
+Without this fix, there is a race condition where the rest of the project builds before the libconnman-qt library is built.  This fix prevents that build race.
+
+diff -Naur meegotouchcp-connman-0.0.13/project.pro meegotouchcp-connman-0.0.13-new/project.pro
+--- meegotouchcp-connman-0.0.13/project.pro	2010-09-23 15:16:48.000000000 -0700
++++ meegotouchcp-connman-0.0.13-new/project.pro	2010-10-21 11:36:58.598610429 -0700
+@@ -3,6 +3,7 @@
+ include (common.pri)
+ TEMPLATE = subdirs
+ SUBDIRS += libconnman-qt libwifiapplet translations
++CONFIG += ordered
+ 
+ #FIXME: should not hardcode
+ desktop_entry.path = /usr/lib/duicontrolpanel

++++++ meegotouchcp-connman.yaml
--- meegotouchcp-connman.yaml
+++ meegotouchcp-connman.yaml
@@ -10,6 +10,8 @@
 Description: |
     This is a plugin for meegotouch-controlpanel that does wifi
     
+Patches:
+    - add_config_ordered.patch
 Requires: 
     - connman
     - meego-handset-cpwifi-branding
@@ -26,6 +28,7 @@
 Builder: make
 Patches:
   - 0001-Fix-BMC-811-and-BMC-3397.patch
+  - 0002-Fix-BMC-8575-ASSERT-row-1-in-file-networklistmodel.c.patch
 Files: 
 - "%{_libdir}/duicontrolpanel/meegotouchcp-connman.desktop"
 - "%{_libdir}/duicontrolpanel/applets/libwifiapplet.so"