I have made the following changes intended for : CE:UX:MTF / meegotouchcp-bluetooth
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/6868 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6868: Messages from BOSS: State: review at 2012-10-02T18:48:47 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: Project:MTF:UX / meegotouchcp-bluetooth -> CE:UX:MTF / meegotouchcp-bluetooth changes files: -------------- --- meegotouchcp-bluetooth.changes +++ meegotouchcp-bluetooth.changes @@ -0,0 +1,4 @@ +* Tue Oct 02 2012 Dmitry Rozhkov <[email protected]> - 0.0.9 +- Reworked meegotouchcp-bluetooth-0.0.9-drop-connman-dependencies.patch not to use + connman code at all. Bluez D-Bus API is used instead. + spec files: ----------- other changes: -------------- ++++++ meegotouchcp-bluetooth-0.0.9-drop-connman-dependencies.patch --- meegotouchcp-bluetooth-0.0.9-drop-connman-dependencies.patch +++ meegotouchcp-bluetooth-0.0.9-drop-connman-dependencies.patch @@ -1,1652 +1,77 @@ -From e6864edde6acc30821f050350de02b1dda9fc49b Mon Sep 17 00:00:00 2001 -From: Marko Saukko <[email protected]> -Date: Wed, 27 Jun 2012 13:03:21 +0000 -Subject: [PATCH] add stuff from connmancp to make bluetoothcp to compile - without it. - ---- - bluetooth/src/commondbustypes.h | 26 ++ - bluetooth/src/connmanmanager.xml | 39 +++ - bluetooth/src/connmanservice.xml | 39 +++ - bluetooth/src/debug.h | 22 ++ - bluetooth/src/networkitemmodel.cpp | 642 ++++++++++++++++++++++++++++++++++++ - bluetooth/src/networkitemmodel.h | 178 ++++++++++ - bluetooth/src/networklistmodel.cpp | 449 +++++++++++++++++++++++++ - bluetooth/src/networklistmodel.h | 106 ++++++ - bluetooth/src/src.pro | 22 +- - bluetooth/src/technologybutton.cpp | 120 +++++++ - bluetooth/src/technologybutton.h | 43 +++ - bluetoothapplet/src/src.pro | 2 +- - 12 files changed, 1683 insertions(+), 5 deletions(-) - create mode 100644 bluetooth/src/commondbustypes.h - create mode 100644 bluetooth/src/connmanmanager.xml - create mode 100644 bluetooth/src/connmanservice.xml - create mode 100644 bluetooth/src/debug.h - create mode 100644 bluetooth/src/networkitemmodel.cpp - create mode 100644 bluetooth/src/networkitemmodel.h - create mode 100644 bluetooth/src/networklistmodel.cpp - create mode 100644 bluetooth/src/networklistmodel.h - create mode 100644 bluetooth/src/technologybutton.cpp - create mode 100644 bluetooth/src/technologybutton.h - -diff --git a/bluetooth/src/commondbustypes.h b/bluetooth/src/commondbustypes.h -new file mode 100644 -index 0000000..0322b06 ---- /dev/null -+++ b/bluetooth/src/commondbustypes.h -@@ -0,0 +1,26 @@ -+/* -*- Mode: C++ -*- -+ * meegotouchcp-connman - connectivity plugin for duicontrolpanel -+ * Copyright © 2010, Intel Corporation. -+ * -+ * This program is licensed under the terms and conditions of the -+ * Apache License, version 2.0. The full text of the Apache License is at -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ */ -+ -+#ifndef COMMONDBUSTYPES_H -+#define COMMONDBUSTYPES_H -+ -+#include <QtCore/QMap> -+#include <QtCore/QString> -+#include <QtCore/QMetaType> -+#include <QtDBus/QtDBus> -+ -+typedef QMap<QString, QString> StringMap; -+Q_DECLARE_METATYPE ( StringMap ); -+ -+inline void registerCommonDataTypes() { -+ qDBusRegisterMetaType<StringMap >(); -+} -+ -+#endif //COMMONDBUSTYPES_H -diff --git a/bluetooth/src/connmanmanager.xml b/bluetooth/src/connmanmanager.xml -new file mode 100644 -index 0000000..5c7e60d ---- /dev/null -+++ b/bluetooth/src/connmanmanager.xml -@@ -0,0 +1,39 @@ -+<?xml version="1.0" encoding="utf-8"?> -+<node name="/Manager" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> -+ <interface name="net.connman.Manager"> -+ -+ <method name="GetProperties" tp:name-for-bindings="Get_Properties"> -+ <arg name="properties" type="a{sv}" direction="out"/> -+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/> -+ </method> -+ -+ <method name="SetProperty" tp:name-for-bindings="Set_Property"> -+ <arg name="name" type="s"/> -+ <arg name="value" type="v"/> -+ </method> -+ -+ <method name="RequestScan" tp:name-for-bindings="Request_Scan"> -+ <arg name="type" type="s"/> -+ </method> -+ -+ <method name="EnableTechnology" tp:name-for-bindings="Enable_Technology"> -+ <arg name="type" type="s"/> -+ </method> -+ -+ <method name="DisableTechnology" tp:name-for-bindings="Disable_Technology"> -+ <arg name="type" type="s"/> -+ </method> -+ -+ <method name="ConnectService" tp:name-for-bindings="Connect_Service"> -+ <arg name="network" type="a{sv}"/> -+ <arg name="service" type="o" direction="out" /> -+ <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QVariantMap"/> -+ </method> -+ -+ <signal name="PropertyChanged" tp:name-for-bindings="Property_Changed"> -+ <arg name="name" type="s"/> -+ <arg name="value" type="v"/> -+ </signal> -+ -+ </interface> -+</node> -diff --git a/bluetooth/src/connmanservice.xml b/bluetooth/src/connmanservice.xml -new file mode 100644 -index 0000000..243d88e ---- /dev/null -+++ b/bluetooth/src/connmanservice.xml -@@ -0,0 +1,39 @@ -+<?xml version="1.0" encoding="utf-8"?> -+<node name="/Service" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";> -+ <interface name="net.connman.Service"> -+ -+ <method name="GetProperties" tp:name-for-bindings="Get_Properties"> -+ <arg name="properties" type="a{sv}" direction="out"/> -+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/> -+ </method> -+ -+ <method name="SetProperty" tp:name-for-bindings="Set_Property"> -+ <arg name="name" type="s"/> -+ <arg name="value" type="v"/> -+ </method> -+ -+ <method name="ClearProperty" tp:name-for-bindings="Clear_Property"> -+ <arg name="name" type="s" /> -+ </method> -+ -+ <method name="Connect" tp:name-for-bindings="Connect" /> -+ -+ <method name="Disconnect" tp:name-for-bindings="Disconnect" /> -+ -+ <method name="Remove" tp:name-for-bindings="Remove" /> -+ -+ <method name="MoveBefore" tp:name-for-bindings="Move_Before"> -+ <arg name="service" type="o"/> -+ </method> -+ -+ <method name="MoveAfter" tp:name-for-bindings="Move_After"> -+ <arg name="service" type="o"/> -+ </method> -+ -+ <signal name="PropertyChanged" tp:name-for-bindings="Property_Changed"> -+ <arg name="name" type="s"/> -+ <arg name="value" type="v"/> -+ </signal> -+ -+ </interface> -+</node> -diff --git a/bluetooth/src/debug.h b/bluetooth/src/debug.h -new file mode 100644 -index 0000000..a8d9f0b ---- /dev/null -+++ b/bluetooth/src/debug.h -@@ -0,0 +1,22 @@ -+/* -*- Mode: C++ -*- -+ * meegotouchcp-connman - connectivity plugin for duicontrolpanel -+ * Copyright © 2010, Intel Corporation. -+ * -+ * This program is licensed under the terms and conditions of the -+ * Apache License, version 2.0. The full text of the Apache License is at -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ */ -+#ifndef DEBUG_H -+#define DEBUG_H -+ -+#include <QString> -+ -+#define STR(qstring) qstring.toLatin1().constData() -+ -+ #include <QtDebug> -+ #define MDEBUG(...) qDebug(__VA_ARGS__) -+ #define MWARNING(...) qWarning(__VA_ARGS__) -+ #define MCRITICAL(...) qCritical(__VA__ARGS__) -+ -+#endif //DEBUG_H -diff --git a/bluetooth/src/networkitemmodel.cpp b/bluetooth/src/networkitemmodel.cpp -new file mode 100644 -index 0000000..916684e ---- /dev/null -+++ b/bluetooth/src/networkitemmodel.cpp -@@ -0,0 +1,642 @@ -+/* -*- Mode: C++ -*- -+ * meegotouchcp-connman - connectivity plugin for duicontrolpanel -+ * Copyright © 2010, Intel Corporation. -+ * -+ * This program is licensed under the terms and conditions of the -+ * Apache License, version 2.0. The full text of the Apache License is at -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ */ -+#include "networkitemmodel.h" -+#include "debug.h" -+#include "commondbustypes.h" (1719 more lines skipped)
