Attachment 866079 Details for Bug 1068657 – fix the return type of GetCharacterExtents v2

[patch] fix the return type of GetCharacterExtents v2

0001-Fix-return-type-of-GetCharacterExtents.patch (text/plain), 3.34 KB, created by David King on 2014-02-21 15:46:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David King

Created: 2014-02-21 15:46:19 UTC

Size: 3.34 KB

patch

obsolete

>From 71cd4167ec53823251fe0ea21530ad5918c000a7 Mon Sep 17 00:00:00 2001
>From: David King <dking@redhat.com>
>Date: Thu, 20 Feb 2014 21:53:39 +0000
>Subject: [PATCH] Fix return type of GetCharacterExtents
>
>The type should be "iiii" but becuase a QVariant<QRect> is passed to
>QDBusMessage it is "(iiii)". Without this patch, Caribou (the GNOME
>on-screen keyboard) could not be used to input text in the text fields
>of Qt applications.
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1067366
>---
> qt-at-spi-fix-get-character-extents-return-type.patch | 17 +++++++++++++++++
> qt-at-spi.spec                                        |  7 ++++++-
> 2 files changed, 23 insertions(+), 1 deletion(-)
> create mode 100644 qt-at-spi-fix-get-character-extents-return-type.patch
>
>diff --git a/qt-at-spi-fix-get-character-extents-return-type.patch b/qt-at-spi-fix-get-character-extents-return-type.patch
>new file mode 100644
>index 0000000..70b4049
>--- /dev/null
>+++ b/qt-at-spi-fix-get-character-extents-return-type.patch
>@@ -0,0 +1,17 @@
>+diff -urN qt-at-spi-qt-at-spi.old/src/atspiadaptor.cpp qt-at-spi-qt-at-spi/src/atspiadaptor.cpp
>+--- qt-at-spi-qt-at-spi.old/src/atspiadaptor.cpp	2012-04-13 14:28:57.000000000 +0100
>++++ qt-at-spi-qt-at-spi/src/atspiadaptor.cpp	2014-02-20 21:52:05.560634651 +0000
>+@@ -1830,7 +1830,11 @@
>+     } else if (function == "GetCharacterExtents") {
>+         int offset = message.arguments().at(0).toInt();
>+         int coordType = message.arguments().at(1).toUInt();
>+-        connection.send(message.createReply(getCharacterExtents(interface, offset, coordType)));
>++        // There is probably a better way to create the list from the rect.
>++        QRect rect = getCharacterExtents(interface, offset, coordType);
>++        QList<QVariant> variantList = QList<QVariant>();
>++        variantList << rect.x() << rect.y() << rect.width() << rect.height();
>++        connection.send(message.createReply(variantList));
>+     } else if (function == "GetDefaultAttributeSet" || function == "GetDefaultAttributes") {
>+         // GetDefaultAttributes is deprecated in favour of GetDefaultAttributeSet.
>+         // Empty set seems reasonable. There is no default attribute set.
>+Binary files qt-at-spi-qt-at-spi.old/src/.atspiadaptor.cpp.swp and qt-at-spi-qt-at-spi/src/.atspiadaptor.cpp.swp differ
>diff --git a/qt-at-spi.spec b/qt-at-spi.spec
>index d0e96c5..8fd398e 100644
>--- a/qt-at-spi.spec
>+++ b/qt-at-spi.spec
>@@ -1,7 +1,7 @@
> 
> Name:    qt-at-spi
> Version: 0.3.1
>-Release: 5%{?dist}
>+Release: 6%{?dist}
> Summary: Qt plugin that bridges Qt's accessibility API to AT-SPI2 
> 
> License: LGPLv2+
>@@ -14,6 +14,7 @@ Source0: qt-at-spi-%{snap}.tar.xz
> # https://gitorious.org/qt-at-spi/qt-at-spi/archive-tarball/v%{version}
> Source0: qt-at-spi-qt-at-spi-v%{version}.tar.gz
> %endif
>+Patch0: qt-at-spi-fix-get-character-extents-return-type.patch
> BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> 
> Source1: qt-at-spi.sh
>@@ -39,6 +40,7 @@ BuildArch: noarch
> %prep
> %setup -q -n %{name}-%{name}
> 
>+%patch0 -p1
> install -m644 -p %{SOURCE1} .
> 
> 
>@@ -68,6 +70,9 @@ make install INSTALL_ROOT=%{buildroot}
> 
> 
> %changelog
>+* Thu Feb 20 2014 David King <dking@redhat.com> 0.3.1-6
>+- Fix return type of GetCharacterExtents
>+
> * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1068657: 866078 | 866079