StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge unsigned commits

Browse Source
This commit is contained in:
sudden6 2016-04-15 01:14:49 +02:00
commit 357ab11f92
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/widget/systemtrayicon.cpp
View File

@ -99,33 +99,6 @@ SystemTrayIcon::SystemTrayIcon()
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"; qDebug() << "Deleting SystemTrayIcon";
} }

3
src/widget/widget.cpp
View File

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