Codebase list ktp-call-ui / 91bbde1
Refresh patches Maximiliano Curia 8 years ago
4 changed file(s) with 13 addition(s) and 135 deletion(s). Raw diff Collapse all Expand all
+13
-3
debian/patches/dbus_include.patch less more
0 From: Debian/Kubuntu KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
1 Date: Fri, 29 Apr 2016 16:47:12 +0200
2 Subject: dbus_include
3
04 Author: Diane Trout <diane@ghic.org>
1 Description: link qtf against d-bus to avoid a missing symbols error.
5 Description: link qtf against d-bus to avoid a missing symbols error
6 ---
7 libqtf/CMakeLists.txt | 1 +
8 1 file changed, 1 insertion(+)
9
10 diff --git a/libqtf/CMakeLists.txt b/libqtf/CMakeLists.txt
11 index 3025576..8b4831b 100644
212 --- a/libqtf/CMakeLists.txt
313 +++ b/libqtf/CMakeLists.txt
4 @@ -10,6 +10,7 @@
14 @@ -10,6 +10,7 @@ include_directories(
515 ${TP_FARSTREAM_INCLUDE_DIRS}
616 ${FARSTREAM_INCLUDE_DIRS}
7 ${TELEPATHY_QT4_FARSTREAM_INCLUDE_DIR}
17 ${TELEPATHY_QT5_FARSTREAM_INCLUDE_DIR}
818 + ${DBUS_INCLUDE_DIR}
919 )
1020
+0
-48
debian/patches/fix-dtmf.patch less more
0 Author: Diane Trout <diane@ghic.org>
1 Description: The TelepathyQt interface reporting if the DTMF works
2 is buggy, this works around that.
3 Applied-Upstream: commit fc0392318f89b22d89e20cd66abd09b265768be9
4 --- a/src/call-window.cpp
5 +++ b/src/call-window.cpp
6 @@ -415,8 +415,11 @@ void CallWindow::setupActions()
7 void CallWindow::checkEnableDtmf()
8 {
9 bool dtmfSupported = false;
10 + Tp::Client::CallContentInterfaceDTMFInterface *dtmfInterface = 0;
11 Q_FOREACH(const Tp::CallContentPtr & content, d->callChannel->contentsForType(Tp::MediaStreamTypeAudio)) {
12 - if (content->supportsDTMF()) {
13 + dtmfInterface = content->interface<Tp::Client::CallContentInterfaceDTMFInterface>();
14 + if (dtmfInterface) {
15 + kDebug() << "Does supportDTMF work? " << content->supportsDTMF() << dtmfInterface;
16 dtmfSupported = true;
17 break;
18 }
19 diff --git a/src/dtmf-handler.cpp b/src/dtmf-handler.cpp
20 index 0c56b73..359eae3 100644
21 --- a/src/dtmf-handler.cpp
22 +++ b/src/dtmf-handler.cpp
23 @@ -42,14 +42,22 @@ void DtmfHandler::connectDtmfQml(DtmfQml *dtmfQml)
24
25 void DtmfHandler::onStartSendDtmfEvent(Tp::DTMFEvent event)
26 {
27 + Tp::Client::CallContentInterfaceDTMFInterface *dtmfInterface = 0;
28 Q_FOREACH(const Tp::CallContentPtr & content, d->channel->contentsForType(Tp::MediaStreamTypeAudio)) {
29 - content->startDTMFTone(event);
30 + dtmfInterface = content->interface<Tp::Client::CallContentInterfaceDTMFInterface>();
31 + if (dtmfInterface) {
32 + dtmfInterface->StartTone(event);
33 + }
34 }
35 }
36
37 void DtmfHandler::onStopSendDtmfEvent()
38 {
39 + Tp::Client::CallContentInterfaceDTMFInterface *dtmfInterface = 0;
40 Q_FOREACH(const Tp::CallContentPtr & content, d->channel->contentsForType(Tp::MediaStreamTypeAudio)) {
41 - content->stopDTMFTone();
42 + dtmfInterface = content->interface<Tp::Client::CallContentInterfaceDTMFInterface>();
43 + if (dtmfInterface) {
44 + dtmfInterface->StopTone();
45 + }
46 }
47 }
+0
-82
debian/patches/qml-fixes.patch less more
0 Author: Diane Trout <diane@ghic.org>
1 Description: some of the qml signal conections were wrong.
2 call-window.cpp: Properly use rootObject for attaching signals
3 between C++ & QML.
4 Connect showDtmfAction signal to toggleDtmf.
5 ToggleButton.qml: use root.checked instead of non-existant
6 function root.activate
7 Fix doubled // in pathname.
8 Applied-Upstream: commit fc0392318f89b22d89e20cd66abd09b265768be9
9 --- a/src/call-window.cpp
10 +++ b/src/call-window.cpp
11 @@ -237,12 +237,15 @@ void CallWindow::onContentAdded(CallContentHandler *contentHandler)
12
13 checkEnableDtmf();
14
15 + // grab root object so we can access QML signals.
16 + QObject *root = d->qmlUi->rootObject();
17 +
18 VolumeController *vol = audioContentHandler->inputVolumeControl();
19 d->muteAction->setEnabled(vol->volumeControlSupported());
20 connect(vol, SIGNAL(volumeControlSupportedChanged(bool)),
21 d->muteAction, SLOT(setEnabled(bool)));
22 connect(vol, SIGNAL(volumeControlSupportedChanged(bool)),
23 - d->qmlUi, SLOT(setSoundEnabled(bool)));
24 + root, SLOT(setSoundEnabled(bool)));
25 d->muteAction->setChecked(vol->isMuted());
26 connect(vol, SIGNAL(mutedChanged(bool)), d->muteAction, SLOT(setChecked(bool)));
27 d->muteAction->setProperty("volumeController", QVariant::fromValue<QObject*>(vol));
28 @@ -369,6 +372,7 @@ void CallWindow::setupActions()
29 d->showDtmfAction = new KToggleAction(i18nc("@action", "Show dialpad"), this);
30 d->showDtmfAction->setIcon(KIcon("phone"));
31 d->showDtmfAction->setEnabled(false);
32 + connect(d->showDtmfAction, SIGNAL(toggled(bool)), SLOT(toggleDtmf(bool)));
33 actionCollection()->addAction("showDtmf", d->showDtmfAction);
34
35 d->goToSystemTrayAction = new KAction(i18nc("@action", "Hide window"), this);
36 @@ -608,11 +612,11 @@ void CallWindow::setupQmlUi()
37 //QML-UI <---> Actions
38 //Show dialpad
39 connect(root, SIGNAL(showDialpadClicked(bool)), SLOT(toggleDtmf(bool)));
40 - connect(d->showDtmfAction, SIGNAL(toggled(bool)), d->qmlUi, SIGNAL(showDialpadChangeState(bool)));
41 + connect(d->showDtmfAction, SIGNAL(toggled(bool)), root, SIGNAL(showDialpadChangeState(bool)));
42 connect(root, SIGNAL(showDialpadClicked(bool)), d->showDtmfAction, SLOT(setChecked(bool)));
43 //Mute <-> Sound activated
44 connect(root,SIGNAL(muteClicked(bool)), SLOT(toggleMute(bool)));
45 - connect(d->muteAction, SIGNAL(toggled(bool)), d->qmlUi, SIGNAL(soundChangeState(bool)));
46 + connect(d->muteAction, SIGNAL(toggled(bool)), root, SIGNAL(muteClicked(bool)));
47 connect(root,SIGNAL(muteClicked(bool)), d->muteAction, SLOT(setChecked(bool)));
48 //Hold
49 connect(root,SIGNAL(holdClicked()),SLOT(hold()));
50 diff --git a/src/qml/core/ToggleButton.qml b/src/qml/core/ToggleButton.qml
51 index 8ca1e65..c760944 100644
52 --- a/src/qml/core/ToggleButton.qml
53 +++ b/src/qml/core/ToggleButton.qml
54 @@ -76,11 +76,11 @@ Item {
55 onClicked: {
56 if (root.enabled) {
57 if (activated.state == "checked") {
58 - root.buttonClick(false);
59 - root.activate(false);
60 + root.buttonClick(false)
61 + root.checked = false
62 } else {
63 root.buttonClick(true)
64 - root.activate(true)
65 + root.checked = true
66 }
67 }
68 }
69 diff --git a/src/qml/core/Toolbar.qml b/src/qml/core/Toolbar.qml
70 index 18fb3fc..7192ea9 100644
71 --- a/src/qml/core/Toolbar.qml
72 +++ b/src/qml/core/Toolbar.qml
73 @@ -36,7 +36,7 @@ Item {
74 if (icon == "start") {
75 hold.iconSource= "image://icon/media-playback-start.png"
76 } else {
77 - hold.iconSource= "image://icon//media-playback-pause.png"
78 + hold.iconSource= "image://icon/media-playback-pause.png"
79 }
80 }
81
+0
-2
debian/patches/series less more
00 dbus_include.patch
1 fix-dtmf.patch
2 qml-fixes.patch