From a7761546eddf14689984ad95f5f6c3aeb4024362 Mon Sep 17 00:00:00 2001
From: Vsevolod Buzinov <ext-vsevolod.buzinov@nokia.com>
Date: Tue, 31 Aug 2010 17:33:38 +0300
Subject: Added security-related changes such as error signal in resource
 engine

---
 libresourceqt/src/resource-engine.cpp | 3 +++
 libresourceqt/src/resource-engine.h   | 1 +
 libresourceqt/src/resource-set.cpp    | 3 +++
 3 files changed, 7 insertions(+)

(limited to 'libresourceqt/src')

diff --git a/libresourceqt/src/resource-engine.cpp b/libresourceqt/src/resource-engine.cpp
index dae826b..47ec436 100644
--- a/libresourceqt/src/resource-engine.cpp
+++ b/libresourceqt/src/resource-engine.cpp
@@ -425,6 +425,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 babddfe..b5d3de2 100644
--- a/libresourceqt/src/resource-set.cpp
+++ b/libresourceqt/src/resource-set.cpp
@@ -46,6 +46,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;
-- 
cgit v1.2.3