Fix memory leaks

Author: grulja

common/gnomehintssettings.cpp

@@ -90,6 +90,7 @@ GnomeHintsSettings::GnomeHintsSettings()
     , m_canUseFileChooserPortal(!m_usePortal)
     , m_gnomeDesktopSettings(g_settings_new("org.gnome.desktop.wm.preferences"))
     , m_settings(g_settings_new("org.gnome.desktop.interface"))
+    , m_fallbackFont(new QFont(QLatin1String("Sans"), 10))
 {
     gtk_init(nullptr, nullptr);
 
@@ -151,6 +152,8 @@ GnomeHintsSettings::GnomeHintsSettings()
     loadTheme();
     loadTitlebar();
 
+    m_palette = new QPalette(Adwaita::Colors::palette(m_gtkThemeDarkVariant ? Adwaita::ColorVariant::AdwaitaDark : Adwaita::ColorVariant::Adwaita));
+
     if (m_canUseFileChooserPortal) {
         QTimer::singleShot(0, this, [this] () {
             const QString filePath = QStringLiteral("/proc/%1/root").arg(QCoreApplication::applicationPid());
@@ -184,6 +187,7 @@ GnomeHintsSettings::GnomeHintsSettings()
                 } else {
                     m_canUseFileChooserPortal = false;
                 }
+                watcher->deleteLater();
             });
         }
     }
@@ -192,6 +196,8 @@ GnomeHintsSettings::GnomeHintsSettings()
 GnomeHintsSettings::~GnomeHintsSettings()
 {
     qDeleteAll(m_fonts);
+    delete m_fallbackFont;
+    delete m_palette;
     if (m_cinnamonSettings) {
         g_object_unref(m_cinnamonSettings);
     }

common/gnomehintssettings.h

@@ -67,14 +67,13 @@ class GnomeHintsSettings : public QObject
             return m_fonts[QPlatformTheme::SystemFont];
         } else {
             // GTK default font
-            return new QFont(QLatin1String("Sans"), 10);
+            return m_fallbackFont;
         }
     }
 
     inline QPalette * palette() const
     {
-        QPalette *palette = new QPalette(Adwaita::Colors::palette(m_gtkThemeDarkVariant ? Adwaita::ColorVariant::AdwaitaDark : Adwaita::ColorVariant::Adwaita));
-        return palette;
+        return m_palette;
     }
 
     inline bool canUseFileChooserPortal() const
@@ -183,6 +182,8 @@ private Q_SLOTS:
     QHash<QPlatformTheme::Font, QFont*> m_fonts;
     QHash<QPlatformTheme::ThemeHint, QVariant> m_hints;
     QMap<QString, QVariantMap> m_portalSettings;
+    QPalette *m_palette = nullptr;
+    QFont *m_fallbackFont = nullptr;
 };
 
 template <> inline int GnomeHintsSettings::getSettingsProperty(GSettings *settings, const QString &property, bool *ok) {

common/qxdgdesktopportalfiledialog.cpp

@@ -302,6 +302,7 @@ void QXdgDesktopPortalFileDialog::openPortal()
                                                   this,
                                                   SLOT(gotResponse(uint,QVariantMap)));
         }
+        watcher->deleteLater();
     });
 }