Fix crash when quiting apper-sentinel due to late deleting

BUG: 255935

Sentinel/DBusInterface.cpp

@@ -28,6 +28,8 @@
 #ifdef HAVE_DEBCONFKDE
 #include <KDialog>
 #include <KWindowSystem>
+#include <Transaction>
+using namespace PackageKit;
 #endif
 
 #include <KDebug>
@@ -50,12 +52,6 @@ DBusInterface::DBusInterface(QObject *parent)
 
 DBusInterface::~DBusInterface()
 {
-    kDebug();
-#ifdef HAVE_DEBCONFKDE
-    foreach (const DebconfGui *gui, m_debconfGuis.values()) {
-        delete gui;
-    }
-#endif //HAVE_DEBCONFKDE
 }
 
 void DBusInterface::RefreshCache()
@@ -76,14 +72,26 @@ void DBusInterface::RefreshAndUpdate()
     emit refreshAndUpdate(true);
 }
 
-void DBusInterface::SetupDebconfDialog(const QString &socketPath, uint xidParent)
+void DBusInterface::SetupDebconfDialog(const QString &tid, const QString &socketPath, uint xidParent)
 {
 #ifdef HAVE_DEBCONFKDE
-    kDebug() << socketPath << xidParent;
+    kDebug() << tid << socketPath << xidParent;
     DebconfGui *gui;
     if (m_debconfGuis.contains(socketPath)) {
         gui = m_debconfGuis[socketPath];
     } else {
+        // Create the Transaction object to delete
+        // the DebconfGui class when the transaction finishes
+        Transaction *transaction = new Transaction(tid);
+        if (transaction->error()) {
+            transaction->deleteLater();
+            return;
+        }
+        transaction->setProperty("socketPath", socketPath);
+        connect(transaction, SIGNAL(finished(PackageKit::Transaction::Exit,uint)),
+                this, SLOT(transactionFinished()));
+
+        // Setup the Debconf dialog
         gui = new DebconfGui(socketPath);
         gui->setWindowModality(Qt::WindowModal);
         gui->setWindowFlags(Qt::Dialog);
@@ -111,4 +119,15 @@ void DBusInterface::debconfActivate()
 #endif
 }
 
+void DBusInterface::transactionFinished()
+{
+#ifdef HAVE_DEBCONFKDE
+    QString socketPath = sender()->property("socketPath").toString();
+    if (m_debconfGuis.contains(socketPath)) {
+        // remove the gui from the list and also delete it
+        m_debconfGuis.take(socketPath)->deleteLater();
+    }
+#endif // HAVE_DEBCONFKDE
+}
+
 #include "DBusInterface.moc"

Sentinel/DBusInterface.h

@@ -40,7 +40,7 @@ public:
     void RefreshCache();
     void RefreshAndUpdate();
     void Update();
-    void SetupDebconfDialog(const QString &socket_path, uint xid_parent);
+    void SetupDebconfDialog(const QString &tid, const QString &socketPath, uint xidParent);
 
 signals:
     void refreshAndUpdate(bool refresh);
@@ -48,6 +48,7 @@ signals:
 
 private slots:
     void debconfActivate();
+    void transactionFinished();
 
 #ifdef HAVE_DEBCONFKDE
 private:

Sentinel/org.kde.ApperSentinel.xml

@@ -8,6 +8,7 @@
        <method name="RefreshAndUpdate" >
        </method>
        <method name="SetupDebconfDialog" >
+           <arg type="s" name="tid" direction="in" />
            <arg type="s" name="socket_path" direction="in" />
            <arg type="u" name="xid_parent" direction="in" />
        </method>

libapper/PkTransaction.cpp

@@ -32,6 +32,7 @@
 
 #include <KDebug>
 
+#include <QStringBuilder>
 #include <QPropertyAnimation>
 #include <QtDBus/QDBusMessage>
 #include <QtDBus/QDBusConnection>
@@ -220,14 +221,18 @@ void PkTransaction::setupTransaction(PackageKit::Transaction *transaction)
     SET_PROXY;
 
 #ifdef HAVE_DEBCONFKDE
+    QString tid;
     QString socket;
-    socket = QLatin1String("/tmp/debconf_") + transaction->tid().remove('/');
+    tid = transaction->tid();
+    // Build a socket path like /tmp/1761_edeceabd_data_debconf
+    socket = QLatin1String("/tmp") % tid % QLatin1String("_debconf");
     QDBusMessage message;
-    message = QDBusMessage::createMethodCall("org.kde.ApperSentinel",
-                                             "/",
-                                             "org.kde.ApperSentinel",
+    message = QDBusMessage::createMethodCall(QLatin1String("org.kde.ApperSentinel"),
+                                             QLatin1String("/"),
+                                             QLatin1String("org.kde.ApperSentinel"),
                                              QLatin1String("SetupDebconfDialog"));
     // Use our own cached tid to avoid crashes
+    message << qVariantFromValue(tid);
     message << qVariantFromValue(socket);
     message << qVariantFromValue(static_cast<uint>(effectiveWinId()));
     QDBusMessage reply = QDBusConnection::sessionBus().call(message);
@@ -235,7 +240,7 @@ void PkTransaction::setupTransaction(PackageKit::Transaction *transaction)
         kWarning() << "Message did not receive a reply";
     }
 
-    transaction->setHints("frontend-socket=" + socket);
+    transaction->setHints(QLatin1String("frontend-socket=") % socket);
 #else
      Q_UNUSED(transaction)
 #endif //HAVE_DEBCONFKDE