we no longer depend on gloox

README

@@ -26,7 +26,6 @@ Dependencies
   CMake 2.8.0 http://www.cmake.org/
   Qt 4.7.0 http://qt.nokia.com/
   QJson 0.7.1 http://qjson.sourceforge.net/
-  Gloox 1.0 http://camaya.net/gloox/
   SQLite 3.6.22 http://www.sqlite.org/
   TagLib 1.6.2 http://developer.kde.org/~wheeler/taglib.html
   Boost 1.3x http://www.boost.org/

src/sourcetree/items/categoryitems.cpp

@@ -169,6 +169,16 @@ CategoryItem::insertItems( QList< SourceTreeItem* > items )
     endRowsAdded();
 }
 
+int
+CategoryItem::peerSortValue() const
+{
+    if( m_category == SourcesModel::PlaylistsCategory )
+        return 100;
+    else if( m_category == SourcesModel::StationsCategory )
+        return -100;
+    else
+        return 0;
+}
 
 void
 CategoryItem::activate()

src/sourcetree/items/categoryitems.h

@@ -55,6 +55,7 @@ public:
         return QString();
     }
     virtual void activate();
+    virtual int peerSortValue() const;
     virtual Qt::ItemFlags flags() const { return Qt::ItemIsEnabled; }
 
     // inserts an item at the end, but before the category add item

src/sourcetree/sourcetreeview.cpp

@@ -79,7 +79,7 @@ SourceTreeView::SourceTreeView( QWidget* parent )
     setUniformRowHeights( false );
     setIndentation( 16 );
     setSortingEnabled( true );
-    sortByColumn( 1, Qt::AscendingOrder );
+    sortByColumn( 0, Qt::AscendingOrder );
 
     // TODO animation conflicts with the expanding-playlists-when-collection-is-null
     // so investigate

src/web/api_v1.cpp

@@ -283,7 +283,7 @@ Api_v1::get_results( QxtWebRequestEvent* event )
     r.insert( "poll_interval", 1000 );
     r.insert( "refresh_interval", 1000 );
     r.insert( "poll_limit", 6 );
-    r.insert( "solved", qry->solved() );
+    r.insert( "solved", qry->playable() );
     r.insert( "query", qry->toVariant() );
 
     QVariantList res;