132678 2006-08-20 10:26:59 +0000 JJ: Right mouse click - search at google - ampersand issue. 2008-03-04 18:57:02 +0000 1 1 10 Unmaintained kdelibs general unspecified Compiled Sources Linux RESOLVED FIXED NOR normal --- 1 nick coolo esigra 0 oldest_to_newest 461763 0 nick 2006-08-20 10:26:59 +0000 Version: (using KDE KDE 3.5.4) Installed from: Compiled From Sources Compiler: GCC 3.4.6 -march=athlon-tbird OS: Linux When highlighting text, right mouse click -> search at google, if the text selected contains and ampersand, the text passed (parsed) for input is cut off at the ampersand; Select the text below, right mouse click -> search at google: KDE & Konqueror KDE&Konqueror Nick 462062 1 kde 2006-08-21 13:51:56 +0000 The & is not converted to %26, but copied as is. This works for other searching places in konqueror, so it seems related to the rightclick search only. 462067 2 kde 2006-08-21 14:34:25 +0000 The error probably is in kdelibs/khtml/khtml_ext.cpp: KHTMLPopupGUIClient::KHTMLPopupGUIClient (near line 400). a) The search text cannot be taken into the menu as is. 1) Selecting & in text results in interpretation as hotkey. 2) Selecting e.g. the text %26 above results in wrong text building, as %2 is interpreted as printf style marker b) Finally URL encoding seems to be missing. P.S. Sorry, but I'm not willing to debug kdelibs ATM. 462113 3 nick 2006-08-21 19:11:27 +0000 OK, thanks for looking at this. I got it so the 'menu' entry reads correct, but the stringe is still passed wrongly: kdelibs/khtml/khtml_ext.cpp around line 444 // search text QString selectedText = khtml->selectedText(); +selectedText.replace("&", "&&"); if ( selectedText.length()>18 ) { selectedText.truncate(15); selectedText+="..."; } But it's no big deal anyway... be just nice to fix next time around. Nick 462291 4 kde 2006-08-22 12:17:19 +0000 Marked as Junior Job. I think this should be pretty easy to fix. 463687 5 kde.org 2006-08-27 17:47:39 +0000 ---------- Forwarded message ---------- From: Will Entriken <kde.org@phor.net> Date: Aug 27, 2006 11:46 AM Subject: [patch] bug 132678 To: 132678@bugzilla.kde.org, kde-devel <kde-devel@kde.org> I think I fixed this bug. It seems like there is a mix of escaped and unescaped query strings, this fixes that. I would commit this patch myself, but it could takes days for my working copy to compile. Updating and compiling really sucks. Created an attachment (id=17521) 132678.patch 463690 6 nick 2006-08-27 18:17:03 +0000 I can't this to build: khtml_ext.cpp: In member function `void KHTMLPartBrowserExtension::searchProvider()': khtml_ext.cpp:276: error: incomplete type `QUrl' used in nested name specifier make[1]: *** [libkhtml_la.all_cpp.lo] Error 1 make[1]: Leaving directory `/home/hdb/kde_build/konstruct/kde/kdelibs/work/kdelibs-3.5.4/khtml' Nick ? 463701 7 kde.org 2006-08-27 18:50:07 +0000 SVN commit 577831 by entriken: CCBUG: 132678 It worksforme, but this patch may fix Nick's problem at: http://bugs.kde.org/show_bug.cgi?id=132678#c6 M +1 -0 khtml_ext.cpp --- trunk/KDE/kdelibs/khtml/khtml_ext.cpp #577830:577831 @@ -38,6 +38,7 @@ #include <qclipboard.h> #include <qfileinfo.h> #include <qmenu.h> +#include <qurl.h> #include <qmetaobject.h> #include <kdebug.h> 463703 8 nick 2006-08-27 18:57:57 +0000 I don't even have the same headers included in khtml_ext.cpp (3.5.4): #include "html/html_imageimpl.h" #include "misc/loader.h" #include "dom/html_form.h" #include "dom/html_image.h" #include <qclipboard.h> #include <qfileinfo.h> #include <qpopupmenu.h> ???????????? #include <qmetaobject.h> #include <private/qucomextra_p.h> #include <qdragobject.h> #include <kdebug.h> #include <klocale.h> #include <kfiledialog.h> 463707 9 nick 2006-08-27 19:14:35 +0000 OK, if I do add in the additional qurl.h header, I get a different build issue: In file included from libkhtml_la.all_cpp.cpp:7: khtml_ext.cpp: In member function `void KHTMLPartBrowserExtension::searchProvider()': khtml_ext.cpp:277: error: `toPercentEncoding' is not a member of `QUrl' make[1]: *** [libkhtml_la.all_cpp.lo] Error 1 make[1]: Leaving directory `/home/hdb/kde_build/konstruct/kde/kdelibs/work/kdelibs-3.5.4/khtml' Nick 463711 10 nick 2006-08-27 19:56:43 +0000 BUGGER ME! I fixed this patch. After reading QT docs, and reading build errors: #include <qclipboard.h> #include <qfileinfo.h> #include <qmenu.h> +#include <qurl.h> #include <qmetaobject.h> if( !KURIFilter::self()->filterURI(data, list) ) { KDesktopFile file("searchproviders/google.desktop", true, "services"); + QString encodedSearchTerm = m_part->selectedText(); + QUrl::encode(encodedSearchTerm); data.setData(file.readEntry("Query").replace("\\{@}", encodedSearchTerm)); // search text QString selectedText = khtml->selectedText(); +selectedText.replace("&", "&&"); if ( selectedText.length()>18 ) { selectedText.truncate(15); selectedText+="..."; } I apologise for not submitting a proper patch... Thanks, Will ! Nick 463847 11 17524 nick 2006-08-28 10:36:38 +0000 Created attachment 17524 Patch against KDE3.5.4 khtml_ext.cpp This works fine... patch attached. 465156 12 kde 2006-08-31 08:32:02 +0000 SVN commit 579136 by stoecker: CCBUG: 132678 Backport of Google search encoding fix for KDE 3.5 by Nick Warne. M +5 -1 khtml_ext.cpp --- branches/KDE/3.5/kdelibs/khtml/khtml_ext.cpp #579135:579136 @@ -38,6 +38,7 @@ #include <qclipboard.h> #include <qfileinfo.h> #include <qpopupmenu.h> +#include <qurl.h> #include <qmetaobject.h> #include <private/qucomextra_p.h> #include <qdragobject.h> @@ -273,7 +274,9 @@ if( !KURIFilter::self()->filterURI(data, list) ) { KDesktopFile file("searchproviders/google.desktop", true, "services"); - data.setData(file.readEntry("Query").replace("\\{@}", m_part->selectedText())); + QString encodedSearchTerm = m_part->selectedText(); + QUrl::encode(encodedSearchTerm); + data.setData(file.readEntry("Query").replace("\\{@}", encodedSearchTerm)); } KParts::URLArgs args; @@ -441,6 +444,7 @@ // search text QString selectedText = khtml->selectedText(); + selectedText.replace("&", "&&"); if ( selectedText.length()>18 ) { selectedText.truncate(15); selectedText+="..."; 467995 13 kde 2006-09-08 18:32:03 +0000 The reported bug is fixed, but selecting "test%2" still results in an error based on the i18n functionality. Needs to be fixed as well. May also be a QT bug. 468213 14 nick 2006-09-09 10:56:35 +0000 Ummm, yes - %1 (or %10, %11 etc.) breaks this also. I think the offending line is 480: new KAction( i18n( "Search '%1' at %2" ).arg( selectedText ).arg( name ), icon, 0, d->m_khtml->browserExtension(), SLOT( searchProvider() ), actionCollection(), "searchProvider" ); Starting to get deep... Nick 468270 15 17681 nick 2006-09-09 13:24:38 +0000 Created attachment 17681 Dirty hack to fix the percent issues . Real dirty hack to fix this percent issue - I think to fix this properly, a lot of diving into the code needs to done. I can't see how both %1 and %2 get 'parsed' as argv in new Kaction if present in SelectedText? - new KAction( i18n( "Search '%1' at %2" ).arg( selectedText ).arg( name ), icon, 0, d->m_khtml->browserExtension(), + // Dirty hack to stop %1 and %2 being being somehow parsed as argv in new Kaction when + // appearing in SelectedText - see bug 132678 + QString selectedTextandName = "'" + selectedText + "' at " + name; + //new KAction( i18n( "Search '%1' at %2" ).arg( selectedText ).arg( name ), icon, 0, d->m_khtml->browserExtension(), + new KAction( i18n( "Search %1" ).arg( selectedTextandName ), icon, 0, d->m_khtml->browserExtension(), SLOT( searchProvider() ), actionCollection(), "searchProvider" ); Nick 468289 16 nick 2006-09-09 15:21:27 +0000 Actually, this is a very deep issue. %26 %27 %28 Will appear correct now in right mouse click menu, but actual data sent to google (etc.) is the encoded characters [ & ' ( ]. So, with the two patches I supplied, it is better and partially fixed, but this underlying issue runs deep. Nick 468803 17 kde 2006-09-10 22:42:44 +0000 Sorry Nick, this does not work. The types %1 and %2 are used, because other languages may require other orders of the arguments. The problem here is that for i18n("Hello %1 %2").arg(x1).arg(x2) the parsing should not reparse the included text (x1) when scanning for %2. Actually it is a QT bug and I will report it there and close this one. #include <QApplication> #include <QPushButton> int main(int argc, char *argv[]) { QApplication app(argc, argv); QPushButton hello(QString("1:%1 2:%2 3:%3").arg("%1").arg("%2").arg("test3")); hello.resize(200, 50); hello.show(); return app.exec(); } Resolving as fixed, as the main bug report has been fulfilled. 469666 18 kde 2006-09-13 21:54:05 +0000 SVN commit 583923 by stoecker: Fixed text error for certain selected texts. CCBUG: 132678 M +2 -1 khtml_ext.cpp --- branches/KDE/3.5/kdelibs/khtml/khtml_ext.cpp #583922:583923 @@ -476,7 +476,8 @@ name = "Google"; } - new KAction( i18n( "Search for '%1' with %2" ).arg( selectedText ).arg( name ), icon, 0, d->m_khtml->browserExtension(), + // using .arg(foo, bar) instead of .arg(foo).arg(bar), as foo can contain %x + new KAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_khtml->browserExtension(), SLOT( searchProvider() ), actionCollection(), "searchProvider" ); // favorite search providers 469676 19 nick 2006-09-13 22:22:51 +0000 Hi Dirk, Heh... so simple a fix. Thanks, all appears to work as it should here! Good job! Nick 17521 2006-08-27 17:47:39 +0000 2006-08-27 17:47:39 +0000 132678.patch 132678.patch application/octet-stream 869 kde.org SW5kZXg6IGtodG1sL2todG1sX2V4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0ga2h0bWwva2h0bWxfZXh0 LmNwcAkocmV2aXNpb24gNTc3NTM5KQorKysga2h0bWwva2h0bWxfZXh0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjcwLDcgKzI3MCw4IEBACiAgICAgaWYoICFLVVJJRmlsdGVyOjpzZWxmKCktPmZp bHRlclVSSShkYXRhLCBsaXN0KSApCiAgICAgewogICAgICAgICBLRGVza3RvcEZpbGUgZmlsZSgi c2VhcmNocHJvdmlkZXJzL2dvb2dsZS5kZXNrdG9wIiwgdHJ1ZSwgInNlcnZpY2VzIik7Ci0gICAg ICAgIGRhdGEuc2V0RGF0YShmaWxlLnJlYWRFbnRyeSgiUXVlcnkiKS5yZXBsYWNlKCJcXHtAfSIs IG1fcGFydC0+c2VsZWN0ZWRUZXh0KCkpKTsKKyAgICAgICAgUVN0cmluZyBlbmNvZGVkU2VhcmNo VGVybSA9IFFVcmw6OnRvUGVyY2VudEVuY29kaW5nKG1fcGFydC0+c2VsZWN0ZWRUZXh0KCkpOwor CWRhdGEuc2V0RGF0YShmaWxlLnJlYWRFbnRyeSgiUXVlcnkiKS5yZXBsYWNlKCJcXHtAfSIsIGVu Y29kZWRTZWFyY2hUZXJtKSk7CiAgICAgfQogCiAgICAgS1BhcnRzOjpVUkxBcmdzIGFyZ3M7CkBA IC00MzYsNiArNDM3LDcgQEAKIAogICAgICAgLy8gc2VhcmNoIHRleHQKICAgICAgIFFTdHJpbmcg c2VsZWN0ZWRUZXh0ID0ga2h0bWwtPnNlbGVjdGVkVGV4dCgpOworICAgICAgc2VsZWN0ZWRUZXh0 LnJlcGxhY2UoIiYiLCAiJiYiKTsKICAgICAgIGlmICggc2VsZWN0ZWRUZXh0Lmxlbmd0aCgpPjE4 ICkgewogICAgICAgICBzZWxlY3RlZFRleHQudHJ1bmNhdGUoMTUpOwogICAgICAgICBzZWxlY3Rl ZFRleHQrPSIuLi4iOwo= 17524 2006-08-28 10:36:38 +0000 2006-08-28 10:36:38 +0000 Patch against KDE3.5.4 khtml_ext.cpp khtml_ext.patch text/plain 1006 nick LS0tIGtodG1sX2V4dC5jcHBPUklHCTIwMDYtMDgtMjcgMTc6MTI6MTMuMDAwMDAwMDAwICswMTAw CisrKyBraHRtbF9leHQuY3BwCTIwMDYtMDgtMjggMDk6MzM6MjcuMDAwMDAwMDAwICswMTAwCkBA IC0zOCw2ICszOCw3IEBACiAjaW5jbHVkZSA8cWNsaXBib2FyZC5oPgogI2luY2x1ZGUgPHFmaWxl aW5mby5oPgogI2luY2x1ZGUgPHFwb3B1cG1lbnUuaD4KKyNpbmNsdWRlIDxxdXJsLmg+CiAjaW5j bHVkZSA8cW1ldGFvYmplY3QuaD4KICNpbmNsdWRlIDxwcml2YXRlL3F1Y29tZXh0cmFfcC5oPgog I2luY2x1ZGUgPHFkcmFnb2JqZWN0Lmg+CkBAIC0yNzMsNyArMjc0LDkgQEAKICAgICBpZiggIUtV UklGaWx0ZXI6OnNlbGYoKS0+ZmlsdGVyVVJJKGRhdGEsIGxpc3QpICkKICAgICB7CiAgICAgICAg IEtEZXNrdG9wRmlsZSBmaWxlKCJzZWFyY2hwcm92aWRlcnMvZ29vZ2xlLmRlc2t0b3AiLCB0cnVl LCAic2VydmljZXMiKTsKLSAgICAgICAgZGF0YS5zZXREYXRhKGZpbGUucmVhZEVudHJ5KCJRdWVy eSIpLnJlcGxhY2UoIlxce0B9IiwgbV9wYXJ0LT5zZWxlY3RlZFRleHQoKSkpOworCVFTdHJpbmcg ZW5jb2RlZFNlYXJjaFRlcm0gPSBtX3BhcnQtPnNlbGVjdGVkVGV4dCgpOworCVFVcmw6OmVuY29k ZShlbmNvZGVkU2VhcmNoVGVybSk7CisJZGF0YS5zZXREYXRhKGZpbGUucmVhZEVudHJ5KCJRdWVy eSIpLnJlcGxhY2UoIlxce0B9IiwgZW5jb2RlZFNlYXJjaFRlcm0pKTsKICAgICB9CiAKICAgICBL UGFydHM6OlVSTEFyZ3MgYXJnczsKQEAgLTQ0MSw2ICs0NDQsNyBAQAogCiAgICAgICAvLyBzZWFy Y2ggdGV4dAogICAgICAgUVN0cmluZyBzZWxlY3RlZFRleHQgPSBraHRtbC0+c2VsZWN0ZWRUZXh0 KCk7CisgICAgICBzZWxlY3RlZFRleHQucmVwbGFjZSgiJiIsICImJiIpOwogICAgICAgaWYgKCBz ZWxlY3RlZFRleHQubGVuZ3RoKCk+MTggKSB7CiAgICAgICAgIHNlbGVjdGVkVGV4dC50cnVuY2F0 ZSgxNSk7CiAgICAgICAgIHNlbGVjdGVkVGV4dCs9Ii4uLiI7Cg== 17681 2006-09-09 13:24:38 +0000 2006-09-09 13:24:38 +0000 Dirty hack to fix the percent issues khtml_ext_percent.patch text/plain 873 nick LS0tIGtodG1sX2V4dC5jcHBPUklHcAkyMDA2LTA5LTA5IDA4OjE1OjA0LjAwMDAwMDAwMCArMDEw MAorKysga2h0bWxfZXh0LmNwcAkyMDA2LTA5LTA5IDEyOjE1OjU1LjAwMDAwMDAwMCArMDEwMApA QCAtNDc2LDcgKzQ3NiwxMSBAQAogICAgICAgICBuYW1lID0gIkdvb2dsZSI7CiAgICAgICB9CiAK LSAgICAgIG5ldyBLQWN0aW9uKCBpMThuKCAiU2VhcmNoICclMScgYXQgJTIiICkuYXJnKCBzZWxl Y3RlZFRleHQgKS5hcmcoIG5hbWUgKSwgaWNvbiwgMCwgZC0+bV9raHRtbC0+YnJvd3NlckV4dGVu c2lvbigpLAorICAgICAgLy8gRGlydHkgaGFjayB0byBzdG9wICUxIGFuZCAlMiBiZWluZyBiZWlu ZyBzb21laG93IHBhcnNlZCBhcyBhcmd2IGluIG5ldyBLYWN0aW9uIHdoZW4KKyAgICAgIC8vIGFw cGVhcmluZyBpbiBTZWxlY3RlZFRleHQgLSBzZWUgYnVnIDEzMjY3OAorICAgICAgUVN0cmluZyBz ZWxlY3RlZFRleHRhbmROYW1lID0gIiciICsgc2VsZWN0ZWRUZXh0ICsgIicgYXQgIiArIG5hbWU7 CisgICAgICAvL25ldyBLQWN0aW9uKCBpMThuKCAiU2VhcmNoICclMScgYXQgJTIiICkuYXJnKCBz ZWxlY3RlZFRleHQgKS5hcmcoIG5hbWUgKSwgaWNvbiwgMCwgZC0+bV9raHRtbC0+YnJvd3NlckV4 dGVuc2lvbigpLAorICAgICAgbmV3IEtBY3Rpb24oIGkxOG4oICJTZWFyY2ggJTEiICkuYXJnKCBz ZWxlY3RlZFRleHRhbmROYW1lICksIGljb24sIDAsIGQtPm1fa2h0bWwtPmJyb3dzZXJFeHRlbnNp b24oKSwKICAgICAgICAgICAgICAgICAgICAgIFNMT1QoIHNlYXJjaFByb3ZpZGVyKCkgKSwgYWN0 aW9uQ29sbGVjdGlvbigpLCAic2VhcmNoUHJvdmlkZXIiICk7CiAKICAgICAgIC8vIGZhdm9yaXRl IHNlYXJjaCBwcm92aWRlcnMK