Przeglądaj źródła

Made dbus errors critical

Malte Veerman 6 lat temu
rodzic
commit
e6520bce92
2 zmienionych plików z 6 dodań i 7 usunięć
  1. 5 5
      import/src/loader.cpp
  2. 1 2
      import/src/systemdcommunicator.cpp

+ 5 - 5
import/src/loader.cpp

@@ -446,20 +446,20 @@ bool Loader::load(const QUrl &url)
             map[QStringLiteral("action")] = QVariant("read");
             map[QStringLiteral("filename")] = fileName;
             action.setArguments(map);
-            auto reply = action.execute();
-            if (!reply->exec())
+            auto job = action.execute();
+            if (!job->exec())
             {
-                if (reply->error() == 4)
+                if (job->error() == 4)
                 {
                     emit info(i18n("Loading of file aborted by user"));
                     return false;
                 }
 
-                emit error(reply->errorString() + reply->errorText(), true);
+                emit error(i18n("KAuth::ExecuteJob error! Code: %1\nAdditional Info: %2; %3", job->error(), job->errorString(), job->errorText()), true);
                 return false;
             }
             else
-                m_configFileContent = reply->data().value(QStringLiteral("content")).toString();
+                m_configFileContent = job->data().value(QStringLiteral("content")).toString();
         }
         else
             emit error(i18n("Action not supported! Try running the application as root."), true);

+ 1 - 2
import/src/systemdcommunicator.cpp

@@ -259,7 +259,6 @@ bool SystemdCommunicator::dbusAction(const QString &method, const QVariantList &
     {
         emit error(i18n("Invalid manager interface!"), true);
         return false;
-
     }
 
     auto action = newFancontrolAction();
@@ -285,7 +284,7 @@ bool SystemdCommunicator::dbusAction(const QString &method, const QVariantList &
         }
     }
     else
-        emit error(i18n("Dbus error: %1", job->errorString()));
+        emit error(i18n("KAuth::ExecuteJob error! Code: %1\nAdditional Info: %2; %3", job->error(), job->errorString(), job->errorText()), true);
 
     return success;
 }