Plugins: Calling unload() on app shutdown.

src/lib/adblock/adblockicon.cpp

@@ -61,7 +61,7 @@ void AdBlockIcon::popupBlocked(const QString &ruleString, const QUrl &url)
     pair.second = url;
     m_blockedPopups.append(pair);
 
-    mApp->desktopNotifications()->showNotifications(QPixmap(":html/adblock_big.png"), tr("Blocked popup window"), tr("AdBlock blocked unwanted popup window."));
+    mApp->desktopNotifications()->showNotification(QPixmap(":html/adblock_big.png"), tr("Blocked popup window"), tr("AdBlock blocked unwanted popup window."));
 
     if (!m_flashTimer) {
         m_flashTimer = new QTimer(this);

src/lib/app/mainapplication.cpp

@@ -619,8 +619,7 @@ void MainApplication::saveSettings()
 
     m_searchEnginesManager->saveSettings();
     m_networkmanager->saveCertificates();
-    m_plugins->c2f_saveSettings();
+    m_plugins->shutdown();
-    m_plugins->speedDial()->saveSettings();
     qIconProvider->saveIconsToDatabase();
 
     AdBlockManager::instance()->save();

src/lib/desktopnotifications/desktopnotificationsfactory.cpp

@@ -49,7 +49,7 @@ void DesktopNotificationsFactory::loadSettings()
     settings.endGroup();
 }
 
-void DesktopNotificationsFactory::showNotifications(const QPixmap &icon, const QString &heading, const QString &text)
+void DesktopNotificationsFactory::showNotification(const QPixmap &icon, const QString &heading, const QString &text)
 {
     if (!m_enabled) {
         return;

src/lib/desktopnotifications/desktopnotificationsfactory.h

@@ -37,7 +37,7 @@ public:
 
     void loadSettings();
 
-    void showNotifications(const QPixmap &icon, const QString &heading, const QString &text);
+    void showNotification(const QPixmap &icon, const QString &heading, const QString &text);
     void nativeNotificationPreview();
 
 private:

src/lib/downloads/downloadmanager.cpp

@@ -257,7 +257,7 @@ void DownloadManager::downloadFinished(bool success)
 
     if (downloadingAllFilesFinished) {
         if (success && qApp->activeWindow() != this) {
-            mApp->desktopNotifications()->showNotifications(QIcon::fromTheme("mail-inbox", QIcon(":icons/notifications/download.png")).pixmap(48), tr("Download Finished"), tr("All files have been successfully downloaded."));
+            mApp->desktopNotifications()->showNotification(QIcon::fromTheme("mail-inbox", QIcon(":icons/notifications/download.png")).pixmap(48), tr("Download Finished"), tr("All files have been successfully downloaded."));
             if (!m_closeOnFinish) {
                 raise();
                 activateWindow();

src/lib/other/updater.cpp

@@ -112,7 +112,7 @@ void Updater::downCompleted(QNetworkReply* reply)
         Version current = parseVersionFromString(QupZilla::VERSION);
         Version updated = parseVersionFromString(html);
         if (current < updated) {
-            mApp->desktopNotifications()->showNotifications(QPixmap(":icons/qupzillaupdate.png"), tr("Update available"), tr("New version of QupZilla is ready to download."));
+            mApp->desktopNotifications()->showNotification(QPixmap(":icons/qupzillaupdate.png"), tr("Update available"), tr("New version of QupZilla is ready to download."));
 //            QAction* action = new QAction(QIcon(":icons/qupzillaupdate.png"), "Update", this);
 //            connect(action, SIGNAL(triggered()), this, SLOT(downloadNewVersion()));
 //            p_QupZilla->menuBar()->addAction(action);

src/lib/plugins/plugins.cpp

@@ -89,6 +89,16 @@ void Plugins::loadSettings()
     c2f_loadSettings();
 }
 
+void Plugins::shutdown()
+{
+    c2f_saveSettings();
+    m_speedDial->saveSettings();
+
+    foreach(PluginInterface * iPlugin, m_loadedPlugins) {
+        iPlugin->unload();
+    }
+}
+
 void Plugins::c2f_loadSettings()
 {
     Settings settings;

src/lib/plugins/plugins.h

@@ -64,6 +64,8 @@ public:
     bool loadPlugin(Plugin* plugin);
     void unloadPlugin(Plugin* plugin);
 
+    void shutdown();
+
     // CLick2Flash
     void c2f_loadSettings();
     void c2f_saveSettings();
@@ -78,6 +80,7 @@ public:
 
 public slots:
     void loadSettings();
+
     void loadPlugins();
 
 protected: