aboutsummaryrefslogtreecommitdiff
path: root/mthemedaemon
diff options
context:
space:
mode:
authorJanne Heikkilä <janne.heikkila@symbio.com>2010-09-17 10:31:07 +0300
committerSergiy Dubovik <sergiy.dubovik@nokia.com>2010-09-24 11:41:09 +0300
commit2766cccb09fa054ca77f895afbb830abe4eefc67 (patch)
tree0338a0307dcfc802e3767158590cc496e6e2666d /mthemedaemon
parent1c4eee37da48ca4364387d2cf4854d8c8e441070 (diff)
Fixes: NB#191029 - Copy of pixmap freezes UI
RevBy: Sergiy Details: Added proper error packet handling and timeout for synchronous/copy pixmap requests. Error packets was not handled properly in MRemoteThemeDaemon. This caused MTheme::copyPixmap() method to freeze (wait infinite time) because only valid replies to the requests was handled and in some cases only error packet got sent as a reply.
Diffstat (limited to 'mthemedaemon')
-rw-r--r--mthemedaemon/mthemedaemonserver.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/mthemedaemon/mthemedaemonserver.cpp b/mthemedaemon/mthemedaemonserver.cpp
index 45d3081f..2cc29255 100644
--- a/mthemedaemon/mthemedaemonserver.cpp
+++ b/mthemedaemon/mthemedaemonserver.cpp
@@ -392,7 +392,7 @@ void MThemeDaemonServer::processOneQueueItem()
new PixmapHandle(item.pixmapId, handle));
} else {
const QString message =
- QString::fromLatin1("requested pixmap '%1' %2x%3 already acquired by client").arg(
+ QString::fromLatin1("requested pixmap '%1' QSize(%2, %3) already acquired by client").arg(
item.pixmapId.imageId,
QString::number(item.pixmapId.size.width()),
QString::number(item.pixmapId.size.height()));
@@ -410,7 +410,7 @@ void MThemeDaemonServer::processOneQueueItem()
const QueueItem item = releasePixmapsQueue.dequeue();
if (!daemon.releasePixmap(item.client, item.pixmapId)) {
const QString message =
- QString::fromLatin1("pixmap to release '%1' %2x%3 not acquired by client").arg(
+ QString::fromLatin1("pixmap to release '%1' QSize(%2, %3) not acquired by client").arg(
item.pixmapId.imageId,
QString::number(item.pixmapId.size.width()),
QString::number(item.pixmapId.size.height()));