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

List:       kde-commits
Subject:    [k3b/kf5] /: Use deprecated method to load KPluginInfo (.desktop file doesn't work).
From:       Johannes Obermayr <johannesobermayr () gmx ! de>
Date:       2016-01-12 0:00:07
Message-ID: E1aImNb-00007Q-5O () scm ! kde ! org
[Download RAW message or body]

Git commit df93845ee2424c59381c49a6b61a36800f7395f8 by Johannes Obermayr.
Committed on 11/01/2016 at 23:58.
Pushed by jobermayr into branch 'kf5'.

Use deprecated method to load KPluginInfo (.desktop file doesn't work).

M  +1    -1    libk3b/plugin/k3bpluginmanager.cpp
M  +1    -1    src/k3bsystemproblemdialog.cpp

http://commits.kde.org/k3b/df93845ee2424c59381c49a6b61a36800f7395f8

diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp
index a9ffcdc..880be68 100644
--- a/libk3b/plugin/k3bpluginmanager.cpp
+++ b/libk3b/plugin/k3bpluginmanager.cpp
@@ -109,7 +109,7 @@ void K3b::PluginManager::Private::loadPlugin( const KService::Ptr &service )
             qDebug() << "plugin system does not fit";
         }
         else {
-            plugin->m_pluginInfo = KPluginInfo( service->entryPath() );
+            plugin->m_pluginInfo = KPluginInfo( service );
             plugins.append( plugin );
         }
     }
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index 4e3022a..72f0fde 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -529,7 +529,7 @@ void K3b::SystemProblemDialog::checkSystem( QWidget* parent, NotificationLevel l
     bool haveMp3Decoder = false;
     for( QList<K3b::Plugin*>::const_iterator it = plugins.constBegin();
          it != plugins.constEnd(); ++it ) {
-        if( (*it)->pluginInfo().pluginName() == "k3bmaddecoder" ) {
+        if( (*it)->pluginInfo().isValid() && (*it)->pluginInfo().pluginName() == "k3bmaddecoder" ) {
             haveMp3Decoder = true;
             break;
         }

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