summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-02-11 09:38:40 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-02-11 09:38:40 +0100
commitd870aaf59eb31fdee8099cf4cef03152e418be78 (patch)
tree7748a71c2d2967f8adc07e999fa058344bfb7f6f /src
parentFinally fix GMail & G+ on content editable?? We'll see user response... (diff)
downloadrekonq-d870aaf59eb31fdee8099cf4cef03152e418be78.tar.xz
Let "Manually load Plugins" work again
Courtesy patch by: Dominik Cermak. Thanks :) BUG:293761
Diffstat (limited to 'src')
-rw-r--r--src/webpluginfactory.cpp4
-rw-r--r--src/webpluginfactory.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/webpluginfactory.cpp b/src/webpluginfactory.cpp
index c0cfceee..7713c74b 100644
--- a/src/webpluginfactory.cpp
+++ b/src/webpluginfactory.cpp
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
*
*
@@ -64,7 +64,7 @@ QObject *WebPluginFactory::create(const QString &mimeType,
case 1:
if (mimeType != QString("application/x-shockwave-flash")
- || mimeType != QString("application/futuresplash"))
+ && mimeType != QString("application/futuresplash"))
break;
if (_loadClickToFlash)
diff --git a/src/webpluginfactory.h b/src/webpluginfactory.h
index 98172887..b1bcd967 100644
--- a/src/webpluginfactory.h
+++ b/src/webpluginfactory.h
@@ -2,7 +2,7 @@
*
* This file is a part of the rekonq project
*
-* Copyright (C) 2009-2011 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009-2012 by Andrea Diamantini <adjam7 at gmail dot com>
* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
*
*