summaryrefslogtreecommitdiffstats
path: root/nsplugins/nspluginloader.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-03 09:14:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-03 09:14:57 +0000
commit27856879bf962f178d88e79144e37a47e731b122 (patch)
treea3bd3f489b755cd2941e7c53b90d12d6bfd4fbe3 /nsplugins/nspluginloader.cpp
parentc5228d52f504d6d2c0fefdd625ec08ebb8e91f85 (diff)
downloadtdebase-27856879bf962f178d88e79144e37a47e731b122.tar.gz
tdebase-27856879bf962f178d88e79144e37a47e731b122.zip
* Massive import of OpenSUSE patches, primarily for bugfixes
* Added some infrastructure created by OpenSUSE to allow for future addition of the Kickoff menu as an option * Minor Slackware compilation fixes git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1171255 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'nsplugins/nspluginloader.cpp')
-rw-r--r--nsplugins/nspluginloader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index e9c50216..3824334c 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 )
{