diff --git a/src/app/mainapplication.h b/src/app/mainapplication.h index 99edca561..8b24c03a0 100644 --- a/src/app/mainapplication.h +++ b/src/app/mainapplication.h @@ -18,6 +18,7 @@ #ifndef MAINAPPLICATION_H #define MAINAPPLICATION_H #define mApp MainApplication::getInstance() +#define mStyle MainApplication::appStyle #include #include @@ -43,6 +44,7 @@ class DownloadManager; class AutoFillModel; class DesktopNotificationsFactory; class IconProvider; +class Style; class MainApplication : public QtSingleApplication { @@ -88,6 +90,8 @@ public: DesktopNotificationsFactory* desktopNotifications(); IconProvider* iconProvider() { return m_iconProvider; } + static Style* appStyle; + public slots: bool saveStateSlot(); void quitApplication(); diff --git a/src/navigation/locationbar.cpp b/src/navigation/locationbar.cpp index 2b5aa66a4..6a2173300 100644 --- a/src/navigation/locationbar.cpp +++ b/src/navigation/locationbar.cpp @@ -154,7 +154,7 @@ void LocationBar::rssIconClicked() void LocationBar::showUrl(const QUrl &url, bool empty) { - if (url.isEmpty() && empty) + if (hasFocus() || (url.isEmpty() && empty)) return; if (url.toEncoded()!=text()) { diff --git a/src/plugins/clicktoflash.cpp b/src/plugins/clicktoflash.cpp index 6bfaaeabe..011e4c92d 100644 --- a/src/plugins/clicktoflash.cpp +++ b/src/plugins/clicktoflash.cpp @@ -61,7 +61,6 @@ ClickToFlash::ClickToFlash(const QUrl &pluginUrl, const QStringList &argumentNam return; } } - QHBoxLayout* horizontalLayout; QFrame* frame; QHBoxLayout* horizontalLayout_2; @@ -112,7 +111,7 @@ void ClickToFlash::hideAdBlocked() findElement(); if (!m_element.isNull()) { m_element.setAttribute("style", "display:none;"); - deleteLater(); + //deleteLater(); //Well, it should be there, but therefore it sometimes crashes } } diff --git a/src/plugins/webpluginfactory.cpp b/src/plugins/webpluginfactory.cpp index 302552c0c..1d70358cc 100644 --- a/src/plugins/webpluginfactory.cpp +++ b/src/plugins/webpluginfactory.cpp @@ -27,11 +27,15 @@ WebPluginFactory::WebPluginFactory(QObject* parent) QObject* WebPluginFactory::create(const QString &mimeType, const QUrl &url, const QStringList &argumentNames, const QStringList &argumentValues) const { + if (mimeType.isEmpty()) + return 0; + if (mimeType != "application/x-shockwave-flash") { if (mimeType != "application/futuresplash") - qDebug() << mimeType; + qDebug() << "missing mimeType handler for: " << mimeType; return 0; } + if (!mApp->plugins()->c2f_isEnabled()) return 0;