Sync to trunk.

src/calibre/constants.py

@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.6.0b1'
+__version__   = '0.6.0b2'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re

src/calibre/gui2/widgets.py

@@ -229,6 +229,12 @@ class LocationModel(QAbstractListModel):
         self.emit(SIGNAL('dataChanged(QModelIndex,QModelIndex)'),
                 self.index(0), self.index(self.rowCount(QModelIndex())-1))
 
+    def location_for_row(self, row):
+        if row == 0: return 'library'
+        if row == 1: return 'main'
+        if row == 3: return 'cardb'
+        return 'carda' if self.free[1] > -1 else 'cardb'
+
 class LocationView(QListView):
 
     def __init__(self, parent):
@@ -252,7 +258,7 @@ class LocationView(QListView):
     def current_changed(self, current, previous):
         if current.isValid():
             i = current.row()
-            location = 'library' if i == 0 else 'main' if i == 1 else 'carda' if i == 2 else 'cardb'
+            location = self.model().location_for_row(i)
             self.emit(SIGNAL('location_selected(PyQt_PyObject)'), location)
             self.model().location_changed(i)
 

src/calibre/web/feeds/__init__.py

@@ -151,7 +151,10 @@ class Feed(object):
             link = None
         description = item.get('summary', None)
 
-        content = '\n'.join(i.value for i in item.get('content', []))
+        content = [i.value for i in item.get('content', []) if i.value]
+        content = [i if isinstance(i, unicode) else i.decode('utf-8', 'replace')
+                for i in content]
+        content = u'\n'.join(content)
         if not content.strip():
             content = None
         if not link and not content: