diff --git a/src/core/cache.cpp b/src/core/cache.cpp --- a/src/core/cache.cpp +++ b/src/core/cache.cpp @@ -156,7 +156,8 @@ e.setEntryXML(stuff); e.setSource(EntryInternal::Cache); - if (e.payload().startsWith(QLatin1String("http://download.kde.org/khotnewstuff"))) { + if (e.payload().startsWith(QLatin1String("http://download.kde.org/khotnewstuff")) + || e.payload().startsWith(QLatin1String("http://autoconfig.kde.org/khotnewstuff"))) { // This is 99% sure a opendesktop file, make it a real one. e.setProviderId(QStringLiteral("https://api.opendesktop.org/v1/")); e.setHomepage(QUrl(QString(QLatin1String("http://opendesktop.org/content/show.php?content=") + e.uniqueId()))); diff --git a/src/downloaddialog.h b/src/downloaddialog.h --- a/src/downloaddialog.h +++ b/src/downloaddialog.h @@ -51,7 +51,6 @@ * The file could look like this for wallpapers: *
[KNewStuff3] - ProvidersUrl=https://download.kde.org/ocs/providers.xml Categories=KDE Wallpaper 1920x1200,KDE Wallpaper 1600x1200 XdgTargetDir=wallpapers Uncompress=archive @@ -72,6 +71,14 @@ * This is what QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + name will return. * * + * If you expect to be using a service other than the KDE Store (such as for example if you wish to use + * a static XML feed), you will also need to specify a ProvidersUrl entry. As an example, the one implied + * when using the KDE Store is: + *+ ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml + *+ * However, again, this should only be done in the case you do not want to use the KDE Store. + * * @since 4.4 */ class KNEWSTUFF_EXPORT DownloadDialog : public QDialog diff --git a/src/downloadwidget.h b/src/downloadwidget.h --- a/src/downloadwidget.h +++ b/src/downloadwidget.h @@ -51,7 +51,6 @@ * The file could look like this for wallpapers: *[KNewStuff3] - ProvidersUrl=https://download.kde.org/ocs/providers.xml Categories=KDE Wallpaper 1920x1200,KDE Wallpaper 1600x1200 StandardResource=wallpaper Uncompress=archive @@ -72,6 +71,14 @@ * This is what QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + name will return. * * + * If you expect to be using a service other than the KDE Store (such as for example if you wish to use + * a static XML feed), you will also need to specify a ProvidersUrl entry. As an example, the one implied + * when using the KDE Store is: + *+ ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml + *+ * However, again, this should only be done in the case you do not want to use the KDE Store. + * * @since 4.5 */ class KNEWSTUFF_EXPORT DownloadWidget : public QWidget diff --git a/tests/khotnewstuff.knsrc b/tests/khotnewstuff.knsrc --- a/tests/khotnewstuff.knsrc +++ b/tests/khotnewstuff.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=http://autoconfig.kde.org/ocs/providers.xml Categories=KDE Wallpaper 1920x1200,KDE Wallpaper 1600x1200 TargetDir=testdirectory diff --git a/tests/khotnewstuff_upload.knsrc b/tests/khotnewstuff_upload.knsrc --- a/tests/khotnewstuff_upload.knsrc +++ b/tests/khotnewstuff_upload.knsrc @@ -1,4 +1,4 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=http://autoconfig.kde.org/ocs/providers.xml UploadCategories=KDE Wallpaper 800x600