[SCM] ktp-call-ui packaging branch, master, updated. debian/0.7.0-1-38-g257af62
Diane Trout
diane-guest at moszumanska.debian.org
Wed May 27 21:39:09 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-call-ui.git;a=commitdiff;h=22a069a
The following commit has been merged in the master branch:
commit 22a069a7da6dd710359b4c59d5fc838cd8b0c19c
Author: Diane Trout <diane at ghic.org>
Date: Wed May 20 22:25:36 2015 -0700
Backport two commits to fix issues with several QML buttons
* Backport two commits to fix issues with several QML buttons
- add fix-dtmp.patch
- add qml-fixes.patch
---
debian/changelog | 3 ++
debian/patches/fix-dtmf.patch | 48 +++++++++++++++++++++++++
debian/patches/qml-fixes.patch | 82 ++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 2 ++
4 files changed, 135 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 73d7f81..bca1ab5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ ktp-call-ui (0.9.0-1) UNRELEASED; urgency=medium
* Update copyright
* Update maintainer to Debian/Kubuntu KDE Extras Team
* Update Standards-Version to 3.9.6. No changes needed.
+ * Backport two commits to fix issues with several QML buttons
+ - add fix-dtmp.patch
+ - add qml-fixes.patch
-- Diane Trout <diane at ghic.org> Sat, 20 Sep 2014 20:46:31 -0700
diff --git a/debian/patches/fix-dtmf.patch b/debian/patches/fix-dtmf.patch
new file mode 100644
index 0000000..737763c
--- /dev/null
+++ b/debian/patches/fix-dtmf.patch
@@ -0,0 +1,48 @@
+Author: Diane Trout <diane at ghic.org>
+Description: The TelepathyQt interface reporting if the DTMF works
+ is buggy, this works around that.
+Applied-Upstream: commit fc0392318f89b22d89e20cd66abd09b265768be9
+--- a/src/call-window.cpp
++++ b/src/call-window.cpp
+@@ -415,8 +415,11 @@ void CallWindow::setupActions()
+ void CallWindow::checkEnableDtmf()
+ {
+ bool dtmfSupported = false;
++ Tp::Client::CallContentInterfaceDTMFInterface *dtmfInterface = 0;
+ Q_FOREACH(const Tp::CallContentPtr & content, d->callChannel->contentsForType(Tp::MediaStreamTypeAudio)) {
+- if (content->supportsDTMF()) {
++ dtmfInterface = content->interface<Tp::Client::CallContentInterfaceDTMFInterface>();
++ if (dtmfInterface) {
++ kDebug() << "Does supportDTMF work? " << content->supportsDTMF() << dtmfInterface;
+ dtmfSupported = true;
+ break;
+ }
+diff --git a/src/dtmf-handler.cpp b/src/dtmf-handler.cpp
+index 0c56b73..359eae3 100644
+--- a/src/dtmf-handler.cpp
++++ b/src/dtmf-handler.cpp
+@@ -42,14 +42,22 @@ void DtmfHandler::connectDtmfQml(DtmfQml *dtmfQml)
+
+ void DtmfHandler::onStartSendDtmfEvent(Tp::DTMFEvent event)
+ {
++ Tp::Client::CallContentInterfaceDTMFInterface *dtmfInterface = 0;
+ Q_FOREACH(const Tp::CallContentPtr & content, d->channel->contentsForType(Tp::MediaStreamTypeAudio)) {
+- content->startDTMFTone(event);
++ dtmfInterface = content->interface<Tp::Client::CallContentInterfaceDTMFInterface>();
++ if (dtmfInterface) {
++ dtmfInterface->StartTone(event);
++ }
+ }
+ }
+
+ void DtmfHandler::onStopSendDtmfEvent()
+ {
++ Tp::Client::CallContentInterfaceDTMFInterface *dtmfInterface = 0;
+ Q_FOREACH(const Tp::CallContentPtr & content, d->channel->contentsForType(Tp::MediaStreamTypeAudio)) {
+- content->stopDTMFTone();
++ dtmfInterface = content->interface<Tp::Client::CallContentInterfaceDTMFInterface>();
++ if (dtmfInterface) {
++ dtmfInterface->StopTone();
++ }
+ }
+ }
diff --git a/debian/patches/qml-fixes.patch b/debian/patches/qml-fixes.patch
new file mode 100644
index 0000000..cfb705b
--- /dev/null
+++ b/debian/patches/qml-fixes.patch
@@ -0,0 +1,82 @@
+Author: Diane Trout <diane at ghic.org>
+Description: some of the qml signal conections were wrong.
+ call-window.cpp: Properly use rootObject for attaching signals
+ between C++ & QML.
+ Connect showDtmfAction signal to toggleDtmf.
+ ToggleButton.qml: use root.checked instead of non-existant
+ function root.activate
+ Fix doubled // in pathname.
+Applied-Upstream: commit fc0392318f89b22d89e20cd66abd09b265768be9
+--- a/src/call-window.cpp
++++ b/src/call-window.cpp
+@@ -237,12 +237,15 @@ void CallWindow::onContentAdded(CallContentHandler *contentHandler)
+
+ checkEnableDtmf();
+
++ // grab root object so we can access QML signals.
++ QObject *root = d->qmlUi->rootObject();
++
+ VolumeController *vol = audioContentHandler->inputVolumeControl();
+ d->muteAction->setEnabled(vol->volumeControlSupported());
+ connect(vol, SIGNAL(volumeControlSupportedChanged(bool)),
+ d->muteAction, SLOT(setEnabled(bool)));
+ connect(vol, SIGNAL(volumeControlSupportedChanged(bool)),
+- d->qmlUi, SLOT(setSoundEnabled(bool)));
++ root, SLOT(setSoundEnabled(bool)));
+ d->muteAction->setChecked(vol->isMuted());
+ connect(vol, SIGNAL(mutedChanged(bool)), d->muteAction, SLOT(setChecked(bool)));
+ d->muteAction->setProperty("volumeController", QVariant::fromValue<QObject*>(vol));
+@@ -369,6 +372,7 @@ void CallWindow::setupActions()
+ d->showDtmfAction = new KToggleAction(i18nc("@action", "Show dialpad"), this);
+ d->showDtmfAction->setIcon(KIcon("phone"));
+ d->showDtmfAction->setEnabled(false);
++ connect(d->showDtmfAction, SIGNAL(toggled(bool)), SLOT(toggleDtmf(bool)));
+ actionCollection()->addAction("showDtmf", d->showDtmfAction);
+
+ d->goToSystemTrayAction = new KAction(i18nc("@action", "Hide window"), this);
+@@ -608,11 +612,11 @@ void CallWindow::setupQmlUi()
+ //QML-UI <---> Actions
+ //Show dialpad
+ connect(root, SIGNAL(showDialpadClicked(bool)), SLOT(toggleDtmf(bool)));
+- connect(d->showDtmfAction, SIGNAL(toggled(bool)), d->qmlUi, SIGNAL(showDialpadChangeState(bool)));
++ connect(d->showDtmfAction, SIGNAL(toggled(bool)), root, SIGNAL(showDialpadChangeState(bool)));
+ connect(root, SIGNAL(showDialpadClicked(bool)), d->showDtmfAction, SLOT(setChecked(bool)));
+ //Mute <-> Sound activated
+ connect(root,SIGNAL(muteClicked(bool)), SLOT(toggleMute(bool)));
+- connect(d->muteAction, SIGNAL(toggled(bool)), d->qmlUi, SIGNAL(soundChangeState(bool)));
++ connect(d->muteAction, SIGNAL(toggled(bool)), root, SIGNAL(muteClicked(bool)));
+ connect(root,SIGNAL(muteClicked(bool)), d->muteAction, SLOT(setChecked(bool)));
+ //Hold
+ connect(root,SIGNAL(holdClicked()),SLOT(hold()));
+diff --git a/src/qml/core/ToggleButton.qml b/src/qml/core/ToggleButton.qml
+index 8ca1e65..c760944 100644
+--- a/src/qml/core/ToggleButton.qml
++++ b/src/qml/core/ToggleButton.qml
+@@ -76,11 +76,11 @@ Item {
+ onClicked: {
+ if (root.enabled) {
+ if (activated.state == "checked") {
+- root.buttonClick(false);
+- root.activate(false);
++ root.buttonClick(false)
++ root.checked = false
+ } else {
+ root.buttonClick(true)
+- root.activate(true)
++ root.checked = true
+ }
+ }
+ }
+diff --git a/src/qml/core/Toolbar.qml b/src/qml/core/Toolbar.qml
+index 18fb3fc..7192ea9 100644
+--- a/src/qml/core/Toolbar.qml
++++ b/src/qml/core/Toolbar.qml
+@@ -36,7 +36,7 @@ Item {
+ if (icon == "start") {
+ hold.iconSource= "image://icon/media-playback-start.png"
+ } else {
+- hold.iconSource= "image://icon//media-playback-pause.png"
++ hold.iconSource= "image://icon/media-playback-pause.png"
+ }
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 83b55df..f9d521e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
dbus_include.patch
+fix-dtmf.patch
+qml-fixes.patch
--
ktp-call-ui packaging
More information about the pkg-kde-commits
mailing list