[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml
From:       Dirk Stoecker <kde () dstoecker ! de>
Date:       2006-08-31 6:30:32
Message-ID: 1157005832.191831.27258.nullmailer () svn ! kde ! org
[Download RAW message or body]

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+="...";
[prev in list] [next in list] [prev in thread] [next in thread]