diff options
Diffstat (limited to 'nsplugins')
-rw-r--r-- | nsplugins/nspluginloader.cpp | 6 | ||||
-rw-r--r-- | nsplugins/nspluginloader.h | 2 | ||||
-rw-r--r-- | nsplugins/pluginscan.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index e9c502169..3824334c0 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -326,7 +326,7 @@ TQString NSPluginLoader::lookup(const TQString &mimeType) } -bool NSPluginLoader::loadViewer() +bool NSPluginLoader::loadViewer(const TQString &mimeType) { kdDebug() << "NSPluginLoader::loadViewer" << endl; @@ -350,7 +350,7 @@ bool NSPluginLoader::loadViewer() } // find the external artsdsp process - if( _useArtsdsp ) { + if( _useArtsdsp && mimeType != "application/pdf" ) { kdDebug() << "trying to use artsdsp" << endl; TQString artsdsp = KGlobal::dirs()->findExe("artsdsp"); if (!artsdsp) @@ -464,7 +464,7 @@ NSPluginInstance *NSPluginLoader::newInstance(TQWidget *parent, TQString url, if ( !_viewer ) { // load plugin viewer process - loadViewer(); + loadViewer(mimeType); if ( !_viewer ) { diff --git a/nsplugins/nspluginloader.h b/nsplugins/nspluginloader.h index 6c2fe83c0..1748bb504 100644 --- a/nsplugins/nspluginloader.h +++ b/nsplugins/nspluginloader.h @@ -101,7 +101,7 @@ protected: TQString lookup(const TQString &mimeType); TQString lookupMimeType(const TQString &url); - bool loadViewer(); + bool loadViewer(const TQString &mimeType); void unloadViewer(); protected slots: diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index 82a5defb2..6914deb93 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -470,7 +470,7 @@ void writeServicesFile( TQStringList mimeTypes ) ts << "Icon=netscape" << endl; ts << "Comment=" << i18n("Netscape plugin viewer") << endl; ts << "X-KDE-Library=libnsplugin" << endl; - ts << "InitialPreference=0" << endl; + ts << "InitialPreference=7" << endl; ts << "ServiceTypes=KParts/ReadOnlyPart,Browser/View" << endl; ts << "X-KDE-BrowserView-PluginsInfo=nsplugins/pluginsinfo" << endl; |