diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-31 11:52:57 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-31 11:52:57 +1000 |
| commit | aa9cf406d62004519ad54596e1c391f9a6439210 (patch) | |
| tree | dd562b9c296981f2761b76623911be8496c7af84 /src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp | |
| parent | 987aec28b950e1c9817a20a9dd71afc071cd93ea (diff) | |
| parent | 56b6a5924008ab5cdbae36e9662eddba923acd5e (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp b/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp index 4140d898b..b9c1656b9 100644 --- a/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/qt/PluginPackageQt.cpp @@ -44,19 +44,19 @@ bool PluginPackage::fetchInfo() typedef char *(*NPP_GetMIMEDescriptionProcPtr)(); NPP_GetMIMEDescriptionProcPtr gm = (NPP_GetMIMEDescriptionProcPtr)m_module->resolve("NP_GetMIMEDescription"); - if (!gm || !gv) { + if (!gm || !gv) return false; - } + char *buf = 0; - NPError err = gv(0, NPPVpluginNameString, (void *)&buf); - if (err != NPERR_NO_ERROR) { + NPError err = gv(0, NPPVpluginNameString, (void*) &buf); + if (err != NPERR_NO_ERROR) return false; - } + m_name = buf; - err = gv(0, NPPVpluginDescriptionString, (void *)&buf); - if (err != NPERR_NO_ERROR) { + err = gv(0, NPPVpluginDescriptionString, (void*) &buf); + if (err != NPERR_NO_ERROR) return false; - } + m_description = buf; determineModuleVersionFromDescription(); @@ -65,7 +65,7 @@ bool PluginPackage::fetchInfo() s.split(UChar(';'), false, types); for (int i = 0; i < types.size(); ++i) { Vector<String> mime; - types[i].split(UChar(':'), true, mime); + types[i].split(UChar(':'), true, mime); if (mime.size() > 0) { Vector<String> exts; if (mime.size() > 1) |