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

List:       kde-commits
Subject:    KDE/kdebase/apps/nsplugins
From:       Maks Orlovich <maksim () kde ! org>
Date:       2009-06-20 22:19:01
Message-ID: 1245536341.114886.29660.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 984515 by orlovich:

Fix dbus assert fail when plugin fails to load (e.g. when it's swfdec or gnash, which \
don't like us claiming to not use gtk)
BUG:195589
CCBUG:191331


 M  +2 -2      nspluginloader.cpp  
 M  +3 -3      viewer/nsplugin.cpp  


--- trunk/KDE/kdebase/apps/nsplugins/nspluginloader.cpp #984514:984515
@@ -457,7 +457,7 @@
 
    // get plugin class object
    QDBusObjectPath cls_ref = _viewer->newClass( plugin_name, ownDBusId );
-   if ( cls_ref.path().isEmpty() )
+   if ( cls_ref.path() == QLatin1String("/null") )
    {
       kDebug() << "Couldn't create plugin class";
       return 0;
@@ -472,7 +472,7 @@
 
    // get plugin instance
    QDBusObjectPath inst_ref = cls->newInstance( url, mime, embed, argn, argv, \
                ownDBusId, callbackId, reload );
-   if ( inst_ref.path().isEmpty() )
+   if ( inst_ref.path() == QLatin1String("/null"))
    {
       kDebug() << "Couldn't create plugin instance";
       delete cls;
--- trunk/KDE/kdebase/apps/nsplugins/viewer/nsplugin.cpp #984514:984515
@@ -1225,7 +1225,7 @@
        if ( cls->error() ) {
            kError(1431) << "Can't create plugin class" << endl;
            delete cls;
-           return QDBusObjectPath();
+           return QDBusObjectPath("/null");
        }
 
        _classes.insert( plugin, cls );
@@ -1407,7 +1407,7 @@
    kDebug(1431) << "-> NSPluginClass::NewInstance";
 
    if ( !_constructed )
-       return QDBusObjectPath();
+       return QDBusObjectPath("/null");
 
    // copy parameters over
    unsigned int argc = argn.count();
@@ -1457,7 +1457,7 @@
    {
       ::free(npp);
       kDebug(1431) << "<- PluginClass::NewInstance = 0";
-      return QDBusObjectPath();
+      return QDBusObjectPath("/null");
    }
 
    // Create plugin instance object


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