1 files changed, 62 insertions, 7 deletions

diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 8e21d39..b6bf298 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -108,5 +108,6 @@ void IMAPviewItem::refresh(QList<RecMail>&)
 {
+    if (childCount()>0) return;
     QList<Folder> *folders = wrapper->listFolders();
 
-    QListViewItem *child = firstChild();
+    QListViewItem *child = firstChild();    
     while ( child ) {
@@ -119,8 +120,44 @@ void IMAPviewItem::refresh(QList<RecMail>&)
     QListViewItem*item = 0;
-    for ( it = folders->first(); it; it = folders->next() ) {
-        item = new IMAPfolderItem( it, this , item );
-        item->setSelectable(it->may_select());
-    }
+    QListViewItem*titem = 0;
+    QListViewItem*inboxitem = 0;
+    QString fname,del,search;
+    int pos;
     // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     folders->setAutoDelete(false);
+    
+    for ( it = folders->first(); it; it = folders->next() ) {
+        if (it->getDisplayName().lower()=="inbox") {
+            inboxitem = new IMAPfolderItem( it, this , item );
+            folders->remove(it);
+            qDebug("inbox found");
+            break;
+        }
+    }
+
+    for ( it = folders->first(); it; it = folders->next() ) {
+        fname = it->getDisplayName();
+        pos = fname.findRev(it->Separator());
+        if (pos != -1) {
+            fname = fname.left(pos);
+            qDebug(fname);
+        }
+        IMAPfolderItem*pitem = (IMAPfolderItem*)firstChild();
+        while (pitem) {
+            if (pitem->matchName(fname)) {
+                break;
+            }
+            pitem=(IMAPfolderItem*)pitem->nextSibling();
+        }
+        if (pitem) {
+            titem = item;
+            item = new IMAPfolderItem(it,pitem,item,this);
+            item->setSelectable(it->may_select());
+            /* setup the short name */
+            item->setText(0,it->getDisplayName().right(it->getDisplayName().length()-pos-1));
+            item = titem;
+        } else {
+            item = new IMAPfolderItem( it, this , (inboxitem?inboxitem:item) );
+            item->setSelectable(it->may_select());
+        }
+    }
     delete folders;
@@ -139,3 +176,3 @@ IMAPfolderItem::~IMAPfolderItem()
 IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after )
-    : AccountViewItem( parent,after )
+    : AccountViewItem( parent )
 {
@@ -151,2 +188,20 @@ IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QList
 
+IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  )
+    : AccountViewItem( parent,after )
+{
+    folder = folderInit;
+    imap = master;
+    if (folder->getDisplayName().lower()!="inbox") {
+        setPixmap( 0, PIXMAP_IMAPFOLDER );
+    } else {
+        setPixmap( 0, PIXMAP_INBOXFOLDER);
+    }
+    setText( 0, folder->getDisplayName() );
+}
+
+bool IMAPfolderItem::matchName(const QString&name)const
+{
+    return folder->getDisplayName()==name;
+}
+
 void IMAPfolderItem::refresh(QList<RecMail>&target)
@@ -171,3 +226,3 @@ AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
              SLOT( refresh( QListViewItem * ) ) );
-    setSorting(-1);
+    setSorting(0);
 }