[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#501093: Tested and working patch.



tags 501093 +patch
thanks

  Hello:

  This patch proposed and applied upstream seems to be working. Unfortunately 
I think it's too late to go though Lenny.

  Regards,

-- 
     Raúl Sánchez Siles
----->Proud Debian user<-----
Linux registered user #416098
Index: kdebase/nsplugins/nspluginloader.cpp
===================================================================
--- kdebase/nsplugins/nspluginloader.cpp	(revisión: 892604)
+++ kdebase/nsplugins/nspluginloader.cpp	(revisión: 892605)
@@ -69,7 +69,7 @@
     if (cfg.readBoolEntry("demandLoad", false)) {
         _button = new QPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this));
         _layout->addWidget(_button, 0, 0);
-        connect(_button, SIGNAL(clicked()), this, SLOT(doLoadPlugin()));
+        connect(_button, SIGNAL(clicked()), this, SLOT(loadPlugin()));
         show();
     } else {
         _button = 0L;
@@ -84,11 +84,15 @@
     }
 }
 
+void NSPluginInstance::loadPlugin()
+{
+    delete _button;
+    _button = 0;
+    doLoadPlugin();
+}
 
 void NSPluginInstance::doLoadPlugin() {
-    if (!inited) {
-        delete _button;
-        _button = 0L;
+    if (!inited && !_button) {
         _loader = NSPluginLoader::instance();
         setBackgroundMode(QWidget::NoBackground);
         WId winid = stub->winId();
Index: kdebase/nsplugins/nspluginloader.h
===================================================================
--- kdebase/nsplugins/nspluginloader.h	(revisión: 892604)
+++ kdebase/nsplugins/nspluginloader.h	(revisión: 892605)
@@ -55,6 +55,7 @@
     void javascriptResult( int id, QString result ) { stub->javascriptResult( id, result ); }
 
 private slots:
+    void loadPlugin();
     void doLoadPlugin();
 
 protected:

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: