summaryrefslogtreecommitdiff
path: root/noncore
authorzecke <zecke>2004-03-23 00:36:37 (UTC)
committer zecke <zecke>2004-03-23 00:36:37 (UTC)
commitd7581f7cd0ba6adb43ee5c4bdeae696c0a16ae3b (patch) (side-by-side diff)
treec65e9015323fb7fc4fec45038aa0f0a19b43252f /noncore
parent428b687982966dc2efabaf6dbcc55ad0ea30aa10 (diff)
downloadopie-d7581f7cd0ba6adb43ee5c4bdeae696c0a16ae3b.zip
opie-d7581f7cd0ba6adb43ee5c4bdeae696c0a16ae3b.tar.gz
opie-d7581f7cd0ba6adb43ee5c4bdeae696c0a16ae3b.tar.bz2
Fix communication. It seems like QPixmap and QDataStream
do not mix well if the QPixmap is not valid.. invalidate image requests if we change the dir
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/gui/iconview.cpp6
-rw-r--r--noncore/graphics/opie-eye/lib/slavemaster.cpp7
-rw-r--r--noncore/graphics/opie-eye/slave/slavereciever.cpp7
3 files changed, 17 insertions, 3 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 0b80012..38a621e 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -95,3 +95,3 @@ PIconView::PIconView( QWidget* wid, Config* cfg )
{
- QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" );
+// QCopEnvelope( "QPE/Application/opie-eye_slave", "foo()" );
}
@@ -148,2 +148,6 @@ void PIconView::slotChangeDir(const QString& path) {
+ // Also invalidate the cache. We can't cancel the operations anyway
+ g_stringPix.clear();
+ g_stringInf.clear();
+
// looks ugly
diff --git a/noncore/graphics/opie-eye/lib/slavemaster.cpp b/noncore/graphics/opie-eye/lib/slavemaster.cpp
index 18dc883..4e28535 100644
--- a/noncore/graphics/opie-eye/lib/slavemaster.cpp
+++ b/noncore/graphics/opie-eye/lib/slavemaster.cpp
@@ -20,4 +20,9 @@ QDataStream & operator >> (QDataStream & str, bool & b)
}
+
+/*
+ * ! We don't put a Pixmap in!!!!
+ */
QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
- return s << inf.file << inf.pixmap << inf.width << inf.height;
+ qWarning( "Image request is %s %d %d", inf.file.latin1(), inf.width, inf.height );
+ return s << inf.file << inf.width << inf.height;
}
diff --git a/noncore/graphics/opie-eye/slave/slavereciever.cpp b/noncore/graphics/opie-eye/slave/slavereciever.cpp
index 951f3df..c8e33d4 100644
--- a/noncore/graphics/opie-eye/slave/slavereciever.cpp
+++ b/noncore/graphics/opie-eye/slave/slavereciever.cpp
@@ -33,4 +33,9 @@ QDataStream &operator<<( QDataStream& s, const PixmapInfo& inf) {
}
+
+/*
+ * GUI sends no QPIxmap!!!
+ */
QDataStream &operator>>( QDataStream& s, PixmapInfo& inf ) {
- s >> inf.file >> inf.pixmap >> inf.width >> inf.height;
+ s >> inf.file >> inf.width >> inf.height;
+ qWarning( "Recieved %s %d %d", inf.file.latin1(), inf.width, inf.height );
return s;