Merge unsigned commits

src/widget/systemtrayicon.cpp

@@ -99,33 +99,6 @@ SystemTrayIcon::SystemTrayIcon()
 
 SystemTrayIcon::~SystemTrayIcon()
 {
-    // only delete the used backend
-    switch(backendType)
-    {
-    case SystrayBackendType::Qt:
-        delete qtIcon;
-        break;
-#ifdef ENABLE_SYSTRAY_UNITY_BACKEND
-    case SystrayBackendType::Unity:
-        delete unityIndicator;
-        delete unityMenu;
-        break;
-#endif
-#ifdef ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND
-    case SystrayBackendType::StatusNotifier:
-        delete statusNotifier;
-        delete snMenu;
-        break;
-#endif
-#ifdef ENABLE_SYSTRAY_GTK_BACKEND
-    case SystrayBackendType::GTK:
-        delete gtkIcon;
-        delete gtkMenu;
-        break;
-#endif
-    default:
-        qWarning() << "Unknown Systray Backend Type";
-    }
     qDebug() << "Deleting SystemTrayIcon";
 }
 

src/widget/widget.cpp

@@ -482,10 +482,7 @@ Widget::~Widget()
     Translator::unregister(this);
     AutoUpdater::abortUpdates();
     if (icon)
-    {
         icon->hide();
-        delete icon;
-    }
 
     delete profileForm;
     delete settingsWidget;