=== modified file 'mixxx/src/library/library.cpp'                                                            
--- mixxx/src/library/library.cpp       2010-03-18 10:18:41 +0000                                            
+++ mixxx/src/library/library.cpp       2010-03-19 08:16:11 +0000                                            
@@ -112,7 +112,7 @@                                                                                          
                                                                                                             
     // used for auto expand                                                                                 
     connect(m_pSidebarModel, SIGNAL(expandIndex(QModelIndex)),                                              
-            pSidebarWidget, SLOT(expand(QModelIndex)));                                                     
+            pSidebarWidget, SLOT(toggleExpansion(QModelIndex)));                                            
                                                                                                             
     QListIterator<LibraryFeature*> feature_it(m_features);                                                  
     while(feature_it.hasNext()) {                                                                           

=== modified file 'mixxx/src/library/sidebarmodel.cpp'
--- mixxx/src/library/sidebarmodel.cpp  2010-03-18 10:18:41 +0000
+++ mixxx/src/library/sidebarmodel.cpp  2010-03-19 08:20:14 +0000
@@ -207,7 +207,7 @@

 bool SidebarModel::dragMoveAccept(const QModelIndex& index, QUrl url)
 {
-    //qDebug() << "SidebarModel::dragMoveAccept() index=" << index << url;
+    qDebug() << "SidebarModel::dragMoveAccept() index=" << index << url;
     if (index.isValid()) {
         if (index.internalPointer() == this) {
             m_hoveredIndex = index;
@@ -274,5 +274,6 @@

 void SidebarModel::slotAutoExpandTimerTimeout()
 {
+    m_autoExpandTimer.stop();
     emit expandIndex(m_hoveredIndex);
 }

=== modified file 'mixxx/src/widget/wlibrarysidebar.cpp'
--- mixxx/src/widget/wlibrarysidebar.cpp        2010-02-09 05:47:28 +0000
+++ mixxx/src/widget/wlibrarysidebar.cpp        2010-03-19 08:17:01 +0000
@@ -40,7 +40,7 @@
  */
 void WLibrarySidebar::dragMoveEvent(QDragMoveEvent * event)
 {
-    //qDebug() << "dragMoveEvent" << event->mimeData()->formats();
+    qDebug() << "dragMoveEvent" << event->mimeData()->formats();

     if (event->mimeData()->hasUrls())
     {
@@ -161,3 +161,9 @@
     else
         QTreeView::keyPressEvent(event);
 }
+
+void WLibrarySidebar::toggleExpansion( QModelIndex index )
+{
+    qDebug() << "WLibrarySidebar::toggleExpansion" << index;
+    setExpanded(index, !isExpanded(index));
+}

=== modified file 'mixxx/src/widget/wlibrarysidebar.h'
--- mixxx/src/widget/wlibrarysidebar.h  2009-12-11 06:10:55 +0000
+++ mixxx/src/widget/wlibrarysidebar.h  2010-03-19 08:16:25 +0000
@@ -16,6 +16,9 @@
     void dropEvent(QDropEvent * event);
     void keyPressEvent(QKeyEvent* event);

+  public slots:
+    void toggleExpansion( QModelIndex index );
+
   signals:
     void rightClicked(const QPoint&, const QModelIndex&);
 };