[Kde-imaging] kdeextragear-libs-1/libkipi/libkipi

[Gilles Caulier]

CVS commit by cgilles: 

BugFix in uploadwidget implementation : removing "/" before the current Album name
else it's can be openned. It's work fine with Digikam and Kimdaba. Thi is must be tested 
on Gwenview !
CCMAIL: kde-imaging at kde.org


  M +18 -6     uploadwidget.cpp   1.8


--- kdeextragear-libs-1/libkipi/libkipi/uploadwidget.cpp  #1.7:1.8
@@ -77,10 +77,14 @@ KIPI::UploadWidget::UploadWidget( KIPI::
     else {
         uploadPath = uploadPath.mid( root.length() );
+        
         m_pendingPath = QStringList::split( "/", uploadPath, true );
+        
         if ( !m_pendingPath[0].isEmpty() )
             m_pendingPath.prepend( "" ); // ensure we open the root first.
 
         load();
-        connect( m_item, SIGNAL( populateFinished(KFileTreeViewItem *) ), this, SLOT( load() ) );
+        
+        connect( m_item, SIGNAL( populateFinished(KFileTreeViewItem *) ),
+                 this, SLOT( load() ) );
     }
 }
@@ -93,6 +97,8 @@ KURL KIPI::UploadWidget::path() const
 void KIPI::UploadWidget::load()
 {
-    if ( m_pendingPath.isEmpty() ) {
-        disconnect( m_item, SIGNAL( populateFinished(KFileTreeViewItem *) ), this, SLOT( load() ) );
+    if ( m_pendingPath.isEmpty() ) 
+        {
+        disconnect( m_item, SIGNAL( populateFinished(KFileTreeViewItem *) ), 
+                    this, SLOT( load() ) );
         return;
     }
@@ -99,6 +105,12 @@ void KIPI::UploadWidget::load()
 
     QString item = m_pendingPath.front();
+
     m_pendingPath.pop_front();
-    m_handled += "/" + item;
+
+    // Bugfix by Gilles (23/06/2004) : It's work fine like this with Digikam and Kimdaba.
+    // This is must be tested with Gwenview
+    
+    //m_handled += "/" + item;
+    m_handled += item;
 
     KFileTreeViewItem* branch = m_treeView->findItem( m_item, m_handled );