Merge remote branch 'origin/master'

3 files changed, 7 insertions, 0 deletions

diff --git a/libresourceqt/src/resource-engine.cpp b/libresourceqt/src/resource-engine.cpp
index 6d50b87..e040562 100644
--- a/libresourceqt/src/resource-engine.cpp
+++ b/libresourceqt/src/resource-engine.cpp
@@ -429,6 +429,9 @@ void ResourceEngine::handleError(quint32 requestNo, qint32 code, const char *mes
     qDebug("ResourceEngine(%d) - Error on request %u(0x%02x): %d - %s",
            identifier, requestNo, originalMessageType, code, message);
     messageMap.remove(requestNo);
+
+    qDebug("emitting errorCallback");
+    emit errorCallback(code, message);
 }
 
 bool ResourceEngine::isConnectedToManager()
diff --git a/libresourceqt/src/resource-engine.h b/libresourceqt/src/resource-engine.h
index 38849aa..58e071b 100644
--- a/libresourceqt/src/resource-engine.h
+++ b/libresourceqt/src/resource-engine.h
@@ -59,6 +59,7 @@ signals:
     void resourcesLost(quint32 bitmaskOfGrantedResources);
     void connectedToManager();
     void disconnectedFromManager();
+    void errorCallback(quint32 code, const char* );
 
 private:
     bool connected;
diff --git a/libresourceqt/src/resource-set.cpp b/libresourceqt/src/resource-set.cpp
index 27e809b..f5faade 100644
--- a/libresourceqt/src/resource-set.cpp
+++ b/libresourceqt/src/resource-set.cpp
@@ -47,6 +47,9 @@ bool ResourceSet::initialize()
                      this, SLOT(handleResourcesLost(quint32)));
     QObject::connect(resourceEngine, SIGNAL(resourcesBecameAvailable(quint32)),
                      this, SLOT(handleResourcesBecameAvailable(quint32)));
+    QObject::connect(resourceEngine, SIGNAL(errorCallback(quint32, const char*)),
+                     this, SIGNAL(errorCallback(quint32, const char*)));
+
     qDebug("initializing resource engine...");
     if (!resourceEngine->initialize()) {
         return false;