I have made the following changes intended for : CE:MW:Shared / connman-qt
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/8197 Thank You, rojkov [This message was auto-generated] --- Request # 8197: Messages from BOSS: State: review at 2013-02-25T17:46:25 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:rojkov:branches:CE:MW:Shared / connman-qt -> CE:MW:Shared / connman-qt changes files: -------------- --- connman-qt.changes +++ connman-qt.changes @@ -0,0 +1,3 @@ +* Mon Feb 25 2013 Dmitry Rozhkov <[email protected]> - 0.4.3.2 +- useragent: pass requested fields as map instead of list + new: ---- 0001-useragent-pass-requested-fields-as-map-instead-of-li.patch spec files: ----------- --- connman-qt.spec +++ connman-qt.spec @@ -16,6 +16,7 @@ URL: https://github.com/nemomobile/libconnman-qt.git Source0: %{name}-%{version}.tar.bz2 Source100: connman-qt.yaml +Patch0: 0001-useragent-pass-requested-fields-as-map-instead-of-li.patch Requires: connman >= 1.10 Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -66,6 +67,8 @@ %prep %setup -q -n %{name}-%{version} +# 0001-useragent-pass-requested-fields-as-map-instead-of-li.patch +%patch0 -p1 # >> setup # << setup other changes: -------------- ++++++ 0001-useragent-pass-requested-fields-as-map-instead-of-li.patch (new) --- 0001-useragent-pass-requested-fields-as-map-instead-of-li.patch +++ 0001-useragent-pass-requested-fields-as-map-instead-of-li.patch @@ -0,0 +1,52 @@ +From 9c0353ee953d139706955cd3ede1cc322bdbb100 Mon Sep 17 00:00:00 2001 +From: Dmitry Rozhkov <[email protected]> +Date: Fri, 22 Feb 2013 18:55:43 +0200 +Subject: [PATCH] useragent: pass requested fields as map instead of list + +Revert the signature of userInputRequested signal to pass +requested fields as QVariantMap instead of QVariantList to avoid +additional manipulations in QML. +--- + libconnman-qt/useragent.cpp | 12 +----------- + libconnman-qt/useragent.h | 2 +- + 2 files changed, 2 insertions(+), 12 deletions(-) + +diff --git a/libconnman-qt/useragent.cpp b/libconnman-qt/useragent.cpp +index e811150..abcb0a7 100644 +--- a/libconnman-qt/useragent.cpp ++++ b/libconnman-qt/useragent.cpp +@@ -37,17 +37,7 @@ UserAgent::~UserAgent() + void UserAgent::requestUserInput(ServiceRequestData* data) + { + m_req_data = data; +- QVariantList fields; +- +- foreach (const QString &key, data->fields.keys()) { +- QVariantMap field; +- +- field.insert("name", key); +- field.insert("type", data->fields.value(key).toMap().value("Type")); +- fields.append(QVariant(field)); +- } +- +- emit userInputRequested(data->objectPath, fields); ++ emit userInputRequested(data->objectPath, data->fields); + } + + void UserAgent::cancelUserInput() +diff --git a/libconnman-qt/useragent.h b/libconnman-qt/useragent.h +index 9408a83..f3f74b1 100644 +--- a/libconnman-qt/useragent.h ++++ b/libconnman-qt/useragent.h +@@ -36,7 +36,7 @@ public: + Q_INVOKABLE void sendUserReply(const QVariantMap &input); + + signals: +- void userInputRequested(const QString &servicePath, const QVariantList &fields); ++ void userInputRequested(const QString &servicePath, const QVariantMap &fields); + void userInputCanceled(); + void errorReported(const QString &error); + +-- +1.7.9.5 + ++++++ connman-qt.yaml --- connman-qt.yaml +++ connman-qt.yaml @@ -7,6 +7,8 @@ URL: https://github.com/nemomobile/libconnman-qt.git Sources: - "%{name}-%{version}.tar.bz2" +Patches: + - 0001-useragent-pass-requested-fields-as-map-instead-of-li.patch Description: | This is a library for working with connman using Qt
