I have made the following changes intended for : CE:MW:Shared / contextkit-meego
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/3232 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 3232: Messages from BOSS: Could not notify CE-maintainers (no address found) State: review 2011-11-24T07:16:41 bossbot Reviews: accepted by bossbot : Prechecks completed; none failed. new by None Changes: submit: home:w00t:branches:CE:MW:Shared / contextkit-meego -> CE:MW:Shared / contextkit-meego changes files: -------------- --- contextkit-meego.changes +++ contextkit-meego.changes @@ -0,0 +1,3 @@ +* Wed Nov 23 2011 Robin Burchell <[email protected]> - 0.0.16 +- libconnman-qt changed the signal of this, so must we + old: ---- Makefile new: ---- 0001-Fixes-N-8-WiFi-indicator-is-broken.patch spec files: ----------- --- contextkit-meego.spec +++ contextkit-meego.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.22 +# Generated by: spectacle version 0.23 # # >> macros # << macros @@ -16,6 +16,7 @@ Source100: contextkit-meego.yaml Patch0: shutdup-debug-spew.patch Patch1: bmc21131.patch +Patch2: 0001-Fixes-N-8-WiFi-indicator-is-broken.patch Requires: contextkit-maemo >= 0.7.24 BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(bluetooth-qt) @@ -66,6 +67,8 @@ %patch0 -p1 # bmc21131.patch %patch1 -p1 +# 0001-Fixes-N-8-WiFi-indicator-is-broken.patch +%patch2 -p1 # >> setup # << setup other changes: -------------- ++++++ 0001-Fixes-N-8-WiFi-indicator-is-broken.patch (new) --- 0001-Fixes-N-8-WiFi-indicator-is-broken.patch +++ 0001-Fixes-N-8-WiFi-indicator-is-broken.patch @@ -0,0 +1,35 @@ +From 9bb2c8c2a1bdb96544b224ed97727c624fc551c5 Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Wed, 23 Nov 2011 15:56:28 +0100 +Subject: [PATCH] Fixes: N#8 - WiFi indicator is broken + +Details: libconnman-qt changed the syntax of this signal, so we need to change. +--- + internet/connmanprovider.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/internet/connmanprovider.cpp b/internet/connmanprovider.cpp +index 2bcd05f..d6336ba 100644 +--- a/internet/connmanprovider.cpp ++++ b/internet/connmanprovider.cpp +@@ -57,7 +57,7 @@ ConnmanProvider::ConnmanProvider(): activeWifi(NULL) + { + activeWifi = m_networkListModel->defaultRoute(); + +- connect(activeWifi,SIGNAL(propertyChanged()),this,SLOT(propertiesChanged())); ++ connect(activeWifi,SIGNAL(propertyChanged(QString,QVariant)),this,SLOT(propertiesChanged())); + + m_properties[signalStrength] = m_networkListModel->defaultRoute()->strength(); + m_properties[networkName] = m_networkListModel->defaultRoute()->name(); +@@ -177,7 +177,7 @@ void ConnmanProvider::defaultRouteChanged(NetworkItemModel *item) + m_properties[signalStrength] = item->strength(); + + connect(activeWifi,SIGNAL(strengthChanged(int)),this,SLOT(signalStrengthChanged(int))); +- connect(activeWifi,SIGNAL(propertyChanged()),this,SLOT(propertiesChanged())); ++ connect(activeWifi,SIGNAL(propertyChanged(QString,QVariant)),this,SLOT(propertiesChanged())); + } + else + m_properties[signalStrength] = 0; +-- +1.7.5.4 + ++++++ contextkit-meego.yaml --- contextkit-meego.yaml +++ contextkit-meego.yaml @@ -16,6 +16,7 @@ Patches: - shutdup-debug-spew.patch - "bmc21131.patch" + - 0001-Fixes-N-8-WiFi-indicator-is-broken.patch PkgBR: - connman-qt-devel - gconf-devel ++++++ deleted files: --- Makefile
