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

List:       kde-commits
Subject:    KDE/kdelibs/kio/kio
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2010-11-21 17:33:39
Message-ID: 20101121173339.E401EAC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199359 by adawit:

- Return the full icon path for favicons.
- Keep the list order of the search engines so that the user's default
  search engine is always the first item in the list.


 M  +8 -2      kurifilter.cpp  


--- trunk/KDE/kdelibs/kio/kio/kurifilter.cpp #1199358:1199359
@@ -25,6 +25,7 @@
 #include <kiconloader.h>
 #include <kservicetypetrader.h>
 #include <kmimetype.h>
+#include <kstandarddirs.h>
 
 #include <QtGui/QPixmap>
 #include <QtCore/QHashIterator>
@@ -44,6 +45,8 @@
             iconName = KMimeType::favIconForUrl(url);
             if (iconName.isEmpty())
                 iconName = KMimeType::iconNameForUrl( url );
+            else
+                iconName = KStandardDirs::locate("cache", iconName + \
QLatin1String(".png"));  break;
         case KUriFilterData::LocalFile:
         case KUriFilterData::LocalDir:
@@ -262,6 +265,7 @@
     QChar searchTermSeparator;
 
     QStringList alternateSearchProviders;
+    QStringList searchProviderList;
     SearchProviderMap searchProviderMap;
 };
 
@@ -353,7 +357,7 @@
 
 QStringList KUriFilterData::preferredSearchProviders() const
 {
-    return d->searchProviderMap.keys();
+    return d->searchProviderList;
 }
 
 KUriFilterSearchProvider KUriFilterData::queryForSearchProvider(const QString& \
provider) const @@ -552,9 +556,11 @@
 
 void KUriFilterPlugin::setSearchProviders(KUriFilterData &data, const \
QList<KUriFilterSearchProvider*>& providers) const  {
-    Q_FOREACH(KUriFilterSearchProvider* searchProvider, providers)
+    Q_FOREACH(KUriFilterSearchProvider* searchProvider, providers) {
+        data.d->searchProviderList << searchProvider->name();
         data.d->searchProviderMap.insert(searchProvider->name(), searchProvider);
 }
+}
 
 QString KUriFilterPlugin::iconNameFor(const KUrl& url, KUriFilterData::UriTypes \
type) const  {


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