Implement deletion for the Document and Camera Liste

This should fix 1540

2 files changed, 12 insertions, 2 deletions

diff --git a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp
index 3c3d702..147eb9c 100644
--- a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp
+++ b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp
@@ -152,7 +152,7 @@ QStringList DCIM_DirLister::findImages()const {
 void DCIM_DirLister::deleteImage( const QString& fl ) {
     QFileInfo inf( fl );
     QFile::remove( fl );
-    QFile::remove( inf.dirPath ()+"/preview"+
+    QFile::remove( inf.dirPath ()+"/preview/"+
                    inf.fileName() );
 }
 
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
index 4a491e2..5281b75 100644
--- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
+++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
@@ -93,8 +93,18 @@ QStringList Doc_DirLister::files()const {
     return out;
 }
 
-void Doc_DirLister::deleteImage( const QString& )
+void Doc_DirLister::deleteImage( const QString& f)
 {
+    /*
+     * find the file in the set of doclnks
+     */
+    QListIterator<DocLnk> dit(m_ds.children());
+    for( ; dit.current(); ++dit) {
+        if ( f == (*dit)->file() ) {
+            (*dit)->removeFiles();
+            return;
+        }
+    }
 }
 
 void Doc_DirLister::thumbNail( const QString& str, int w, int h)