Merge lp:~mblayman/entertainer/bye-feedz into lp:entertainer

[Matt Layman]

All feed code is now removed. Lots of pylint cleanup too.

This branch removes all the feed related logic. It is highly doubtful that anyone is using Entertainer as a feed reader and the maintenance burden for keeping that code is not worth it. Therefore, I'm getting rid of it to focus on core features of a media center (video, music, photo).

[Matt Layman (mblayman)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2009-05-06 03:40:22 +0000
+++ Makefile	2010-04-03 15:04:16 +0000
@@ -12,16 +12,6 @@
 CTAGS_FLAGS=-R -o ${CTAGS_FILENAME}
 CTAGS_CLEAN=rm -f ${CTAGS_FILENAME}
 
-DOCS_DIR=cd docs
-DOCS_TEMP_DIR=docs
-DOCS_CREATE_TEMP_DIR=if ! test -d "${DOCS_TEMP_DIR}"; then mkdir ${DOCS_TEMP_DIR}; fi
-DOCS_PDF=pdflatex
-DOCS_PDF_FLAGS=-output-directory=${DOCS_TEMP_DIR} -output-format=pdf
-DOCS_HTML=latex2html
-DOCS_HTML_FLAGS=-dir ${DOCS_TEMP_DIR}
-DOCS_CLEAN=rm -rf docs entertainer-docs.tar.gz
-DOCS_TAR=${DOCS_DIR}; tar -czf entertainer-docs.tar.gz docs
-
 TOOLS_DIR=cd tools
 TRANSLATE= ${PYTHON} translations_generator.py
 
@@ -43,17 +33,7 @@
 tags:
 	${CTAGS} ${CTAGS_FLAGS} entertainerlib
 
-docs: docs-html docs-pdf
-	${DOCS_TAR}
-
-docs-html:
-	${DOCS_DIR};${DOCS_CREATE_TEMP_DIR};${DOCS_HTML} ${DOCS_HTML_FLAGS} user_guide.tex
-
-docs-pdf:
-	${DOCS_DIR};${DOCS_CREATE_TEMP_DIR};${DOCS_PDF} ${DOCS_PDF_FLAGS} user_guide.tex
-
 clean:
-	${DOCS_DIR};${DOCS_CLEAN}
 	${CTAGS_CLEAN}
 
 depgraph:
@@ -62,5 +42,3 @@
 	cat /tmp/entertainer.deps | sfood-cluster -f /tmp/entertainer-clusters > /tmp/clustered
 	cat /tmp/clustered | sfood-graph -p | dot -T png > docs/entertainer-depgraph.png
 
-
-

=== modified file 'cfg/content.conf'
--- cfg/content.conf	2009-08-16 22:19:22 +0000
+++ cfg/content.conf	2010-04-03 15:04:16 +0000
@@ -10,10 +10,6 @@
 location = Bath,England
 display_in_menu = True
 
-[RSS]
-feeds = http://theironlion.net/blog/feed;http://www.joshuascotton.com/main/archives/tag/entertainer/feed;http://laymanstermsdev.wordpress.com/feed
-fetch_interval = 15
-
 [CD]
 display_eject_in_menu = False
 

=== modified file 'docs/DEPENDENCIES'
--- docs/DEPENDENCIES	2009-11-09 22:43:06 +0000
+++ docs/DEPENDENCIES	2010-04-03 15:04:16 +0000
@@ -1,9 +1,10 @@
 python-cairo
 python-cddb
 python-clutter
+python-cluttergst
+python-cluttergtk
 python-ctypes
 python-eyed3
-python-feedparser
 python-gobject
 python-gst0.10
 python-gtk2

=== removed file 'docs/developer_documentation.pdf'
Binary files docs/developer_documentation.pdf	2008-12-14 19:58:40 +0000 and docs/developer_documentation.pdf	1970-01-01 00:00:00 +0000 differ
=== removed file 'docs/entertainer-depgraph.png'
Binary files docs/entertainer-depgraph.png	2009-02-01 19:35:11 +0000 and docs/entertainer-depgraph.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'entertainer'
--- entertainer	2009-05-10 17:36:49 +0000
+++ entertainer	2010-04-03 15:04:16 +0000
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Main client executable'''
-'''Main frontend executable'''
 
 from entertainerlib.client import main
 

=== modified file 'entertainerlib/backend/backend_server.py'
--- entertainerlib/backend/backend_server.py	2009-09-08 02:02:58 +0000
+++ entertainerlib/backend/backend_server.py	2010-04-03 15:04:16 +0000
@@ -3,37 +3,20 @@
 
 import gobject
 
-from entertainerlib.configuration import Configuration
-from entertainerlib.logger import Logger
-
-# Entertainer backend core
-from entertainerlib.backend.core.message import Message
+from entertainerlib.backend.components.mediacache.media_cache_manager import (
+    MediaCacheManager)
 from entertainerlib.backend.core.message_bus import MessageBus
 from entertainerlib.backend.core.message_scheduler import MessageScheduler
 from entertainerlib.backend.core.connection_server import ConnectionServer
 from entertainerlib.backend.core.message_type_priority import (
     MessageType, MessagePriority)
-
-# Entertainer backend components
-from entertainerlib.backend.components.feeds.feed_manager import FeedManager
-from entertainerlib.backend.components.mediacache.media_cache_manager import (
-    MediaCacheManager)
+from entertainerlib.configuration import Configuration
+from entertainerlib.logger import Logger
 
 class BackendServer:
-    """
-    Entertainer backend server.
-
-    This is a backend of Entertainer media center. Backend is responsible of
-    many vital things like updateing media library cache, recording scheduled
-    TV-shows, fetching RSS-feeds etc.
-    """
+    '''Backend is responsible for things like updating media library cache.'''
 
     def __init__(self):
-        """
-        Initialize backend
-
-        This method creates and initializes all backend components.
-        """
         gobject.threads_init()
 
         self.config = Configuration()
@@ -45,13 +28,11 @@
         self.connection_server = None
 
         self.scheduler = None
-        self.feed_manager = None
         self.media_manager = None
 
         # The order of the initialize method calls is significant! Don't change
-        # the order unless you know what your doing!
+        # the order unless you know what you are doing!
         self.initialize_configuration()
-        self.initialize_feed_manager()
         self.initialize_media_cache_manager()
         self.initialize_connection_server()
         self.initialize_scheduler()
@@ -73,19 +54,8 @@
     def initialize_scheduler(self):
         """Initialize message scheduler."""
         self.scheduler = MessageScheduler(self.message_bus)
-        self.scheduler.addMessage(Message(MessageType.UPDATE_FEEDS),
-            60 * self.config.feed_fetch_interval)
         self.logger.debug("Message scheduler intialized successfully")
 
-    def initialize_feed_manager(self):
-        """Initialize feed manager."""
-        self.feed_manager = FeedManager(self.message_bus)
-        feed_mgr_dict = { MessageType.UPDATE_FEEDS : MessagePriority.HIGH,
-                        MessageType.REBUILD_FEED_CACHE : MessagePriority.HIGH }
-        self.message_bus.registerMessageHandler(self.feed_manager,
-                                                feed_mgr_dict)
-        self.logger.debug("Feed Manager intialized successfully")
-
     def initialize_media_cache_manager(self):
         '''Initialize the media cache manager'''
         self.media_manager = MediaCacheManager()

=== removed directory 'entertainerlib/backend/components/feeds'
=== removed file 'entertainerlib/backend/components/feeds/__init__.py'
--- entertainerlib/backend/components/feeds/__init__.py	2009-05-06 03:40:22 +0000
+++ entertainerlib/backend/components/feeds/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Feed component'''

=== removed file 'entertainerlib/backend/components/feeds/feed_fetcher.py'
--- entertainerlib/backend/components/feeds/feed_fetcher.py	2009-05-10 17:36:49 +0000
+++ entertainerlib/backend/components/feeds/feed_fetcher.py	1970-01-01 00:00:00 +0000
@@ -1,138 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Update all feeds to local cache'''
-
-import threading
-import feedparser
-from time import strptime
-from datetime import datetime
-from pysqlite2 import dbapi2 as sqlite
-
-from entertainerlib.configuration import Configuration
-from entertainerlib.logger import Logger
-
-# Messaging system
-from entertainerlib.backend.core.message import Message
-from entertainerlib.backend.core.message_type_priority import MessageType
-
-class FeedFetcher(threading.Thread):
-    """Update all feeds to the local feed cache database."""
-
-    # Number of entries to keep in cache for each feed
-    NUMBER_OF_ENTRIES = 50
-
-    def __init__(self, message_bus, feeds):
-        """
-        Create a new feed fetch thread
-        @param message_bus: MessageBus object
-        @param feeds: List of feeds (List of URL-strings)
-        """
-        threading.Thread.__init__(self)
-        self.setName("FeedFetcher")
-        self.message_bus = message_bus
-        self.logger = Logger().getLogger('backend.components.feed.FeedFetcher')
-        self.config = Configuration()
-        self.feeds = feeds
-
-    def run(self):
-        """Update feed cache in a seperated thread"""
-        db_conn = sqlite.connect(self.config.FEED_DB)
-        db_cursor = db_conn.cursor()
-        for element in self.feeds:
-            if element:
-                has_new_entries = False
-                data = feedparser.parse(element)
-                if data.bozo:
-                    self.logger.warning("Malformed feed skipped: " + element)
-                    continue # move to the next feed
-                try:
-                    dt = data.feed.date_parsed
-                    last_update = datetime(dt[0], dt[1], dt[2],
-                                           dt[3], dt[4], dt[5])
-                except AttributeError:
-                    dt = data.entries[0].date_parsed
-                    last_update = datetime(dt[0], dt[1], dt[2],
-                                           dt[3], dt[4], dt[5])
-
-                #Check if this feed has new entries
-                db_cursor.execute("""SELECT date,time
-                                     FROM   feed
-                                     WHERE  url=:url""",
-                                     { "url": data.feed.link})
-                result = db_cursor.fetchall()
-
-                if(len(result) == 0):
-                    # Set in past so that all entries are added to the database!
-                    current_update = datetime(1970, 01, 01, 00, 00, 00)
-
-                    # This is a completely new feed
-                    feed_row = (data.feed.link,
-                                data.feed.title,
-                                data.feed.subtitle,
-                                data.channel.description,
-                                last_update.strftime("%Y-%m-%d"),
-                                last_update.strftime("%H:%M:%S"))
-                    db_cursor.execute(
-                        """INSERT INTO feed(url,title,subtitle,
-                        description,date,time) VALUES (?,?,?,?,?,?)""", \
-                            feed_row)
-                    db_conn.commit()
-                    has_new_entries = True
-                else:
-                    # This feed is already in cache. Check if it has new entries
-                    tmp = str(result[0][0]) + " " + str(result[0][1])
-                    current_update = datetime(*strptime(tmp,
-                                        "%Y-%m-%d %H:%M:%S")[0:6])
-                    if last_update > current_update:
-                        db_cursor.execute(
-                            "UPDATE feed SET date=?,time=? WHERE url=?",
-                            (last_update.strftime("%Y-%m-%d"),
-                             last_update.strftime("%H:%M:%S"), data.feed.link))
-                        db_conn.commit()
-                        has_new_entries = True
-
-                # If this feed has new entries we update the cache
-                if has_new_entries:
-                    for i in range(len(data.entries)):
-                        ed = data.entries[i].date_parsed
-                        e_timestamp = datetime(ed[0], ed[1], ed[2],
-                                               ed[3], ed[4], ed[5])
-
-                        # If entry is new (not cached in previous update)
-                        if e_timestamp > current_update:
-                            entry_row = (data.feed.link,
-                                         data.entries[i].title,
-                                         data.entries[i].description,
-                                         "NO", # This entry hasn't been read yet
-                                         data.entries[i].id,
-                                         e_timestamp.strftime("%Y-%m-%d"),
-                                         e_timestamp.strftime("%H:%M:%S"))
-                            db_cursor.execute("""INSERT INTO
-                                entry(feed_url,title,description,isread,id,date,time)
-                                VALUES (?,?,?,?,?,?,?)""", entry_row)
-                            db_conn.commit()
-
-                        # Remove old entries from cache if there are
-                        # more entries than limit allows
-                        db_cursor.execute("""SELECT date, time
-                                             FROM entry
-                                             WHERE feed_url=:url
-                                             ORDER BY date, time""",
-                                             { "url" : data.feed.link})
-                        result = db_cursor.fetchall()
-                        if len(result) > self.NUMBER_OF_ENTRIES:
-                            limit_date = result[self.NUMBER_OF_ENTRIES][0]
-                            limit_time = result[self.NUMBER_OF_ENTRIES][1]
-                            db_cursor.execute("""DELETE FROM entry
-                                                 WHERE feed_url=:url
-                                                 AND date < :date
-                                                 AND time < :time""",
-                                                 { "url" : str(data.feed.link),
-                                                   "date" : str(limit_date) ,
-                                                   "time": str(limit_time)})
-                            db_conn.commit()
-
-        # Notify that feed database has been updated
-        db_conn.close()
-        self.logger.info("Feed cache has been updated")
-        self.message_bus.notifyMessage(Message(MessageType.FEED_DB_UPDATED))
-

=== removed file 'entertainerlib/backend/components/feeds/feed_manager.py'
--- entertainerlib/backend/components/feeds/feed_manager.py	2009-08-16 23:01:49 +0000
+++ entertainerlib/backend/components/feeds/feed_manager.py	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''FeedManager - Manage feeds'''
-
-import os
-from pysqlite2 import dbapi2 as sqlite
-from entertainerlib.backend.components.feeds.feed_fetcher import FeedFetcher
-
-from entertainerlib.configuration import Configuration
-from entertainerlib.logger import Logger
-
-# Messaging system
-from entertainerlib.backend.core.message_type_priority import MessageType
-from entertainerlib.backend.core.message_handler import MessageHandler
-
-class FeedManager(MessageHandler):
-    """Backend feed manager keeps feeds cache database updated."""
-
-    def __init__(self, message_bus):
-        """
-        Create a new FeedManager object
-        @param message_bus: MessageBus object
-        """
-        self.message_bus = message_bus
-        self.logger = Logger().getLogger(
-            'backend.components.feeds.FeedManager')
-        self.config = Configuration()
-
-        if not os.path.exists(self.config.FEED_DB):
-            self.createFeedCacheDatabase()
-        MessageHandler.__init__(self)
-        self.updateFeedCache()
-
-    def updateFeedCache(self):
-        """
-        Update all feeds to cache in a new thread and after
-        that emit FEED_DB_UPDATED message to the messagebus.
-        """
-        fetch_thread = FeedFetcher(self.message_bus, self.config.feeds)
-        fetch_thread.start()
-
-    def createFeedCacheDatabase(self):
-        """Create a feed cache database file and tables."""
-        db_conn = sqlite.connect(self.config.FEED_DB)
-        db_cursor = db_conn.cursor()
-        db_cursor.execute("""CREATE TABLE feed(
-                                url TEXT,
-                                title TEXT,
-                                subtitle TEXT,
-                                description TEXT,
-                                time TIME,
-                                date DATE,
-                                PRIMARY KEY(url))""")
-
-        db_cursor.execute("""CREATE TABLE entry(
-                                feed_url TEXT,
-                                title TEXT,
-                                description TEXT,
-                                isread TEXT,
-                                time TIME,
-                                date DATE,
-                                id TEXT,
-                                PRIMARY KEY(id))""")
-        db_conn.commit()
-        db_conn.close()
-
-    def wipeFeedCacheDatabase(self):
-        """Wipes the feed cache database file and tables."""
-        # all we need to do to wipe the cache database is to drop the two
-        # tables containing the data: feed and entry
-        db_conn = sqlite.connect(self.config.FEED_DB)
-        db_cursor = db_conn.cursor()
-        db_cursor.execute("""DROP TABLE IF EXISTS feed""")
-        db_cursor.execute("""DROP TABLE IF EXISTS entry""")
-        db_conn.commit()
-        db_conn.close()
-
-    # Implementes MessageHandler interface
-    def handleMessage(self, message):
-        """
-        Handle the received message
-        @param message: Received Message object
-        """
-        if message.get_type() == MessageType.UPDATE_FEEDS:
-            self.updateFeedCache()
-        elif message.get_type() == MessageType.REBUILD_FEED_CACHE:
-            #rebuild feed cache
-            self.rebuildFeedCacheDatabase()
-
-    def rebuildFeedCacheDatabase(self):
-        """Destroy all current data and index everything from the scratch."""
-        self.logger.info("Feed cache rebuilding requested")
-        # we remove the tables from the database the create them again,
-        # this wipes the tables
-        self.wipeFeedCacheDatabase()
-        self.createFeedCacheDatabase()
-        # there will be no data in the tables so we need to populate
-        # the feed cache
-        self.updateFeedCache()
-        self.logger.info("Feed cache rebuilt")
-

=== removed file 'entertainerlib/backend/components/feeds/feed_utils.py'
--- entertainerlib/backend/components/feeds/feed_utils.py	2009-11-11 10:12:34 +0000
+++ entertainerlib/backend/components/feeds/feed_utils.py	1970-01-01 00:00:00 +0000
@@ -1,239 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Utilities for fetching feeds'''
-
-import os
-import urllib
-from xml.dom import minidom
-
-import gtk
-
-from entertainerlib.configuration import Configuration
-
-
-class FeedEntryParser:
-    """Will handle encoding and html for displaying feed entries"""
-
-    def strip_tags(self, text, valid_tags=None):
-        """
-        Strips a text string of all markup tags except the tags specified
-        @param text the text to be stripped
-        @param valid_tags a list of the allowed tags
-        """
-
-        #setup variables
-        valid_tag_list = []
-        output = ""
-        in_tag = False
-        in_tag_name = False
-        tag = ""
-        tag_attributes = ""
-
-        if valid_tags is None:
-            valid_tags = []
-
-        #append closing tags to tag list
-        for next_tag in valid_tags:
-            valid_tag_list.append(next_tag)
-            valid_tag_list.append("/"+next_tag)
-
-        #setup a list to parse from input
-        parse_list = list(text)
-
-        i = 0
-        while i < len(parse_list):
-            c = parse_list[i]
-            if c == "<":
-                #we are into the tag and the tag name
-                in_tag = True
-                in_tag_name = True
-                parse_list.pop(i)
-            elif in_tag:
-                #we are in a tag
-                if c == " " and in_tag_name:
-                    #tag name has ended we are now into tag_attributes
-                    in_tag_name = False
-                    tag_attributes += parse_list.pop(i)
-                elif c == ">":
-                    #tag has finished let's clean up
-                    in_tag = False
-                    parse_list.pop(i)
-                    #check if tag matches
-                    if tag in valid_tag_list:
-                        output += ("<" + tag + tag_attributes + ">")
-                    tag = ""
-                    tag_attributes = ""
-                elif in_tag_name:
-                    #we are in a tag name lets append current char to tag
-                    tag += parse_list.pop(i)
-                else:
-                    #we are in tag attributes lets append current char to
-                    #attributes
-                    tag_attributes += parse_list.pop(i)
-            else:
-                #not in a tag so append current char to output
-                output += parse_list.pop(i)
-
-        return output
-
-    def strip_non_pango_tags(self, text):
-        """
-        Strips a text string of all non-pango tags
-        @param text the text to be stripped
-        """
-        return self.strip_tags(text,
-            ["span", "b", "big", "i", "s", "sub", "sup", "small", "tt", "u"])
-
-    def convert(self, text):
-        """
-        This converts a text string into a format acceptable by a clutter
-        label object
-
-        @param text the text to be converted
-        """
-
-        return self.strip_non_pango_tags(text).replace('&nbsp;', ' ')
-
-
-class OPMLParser:
-    """Enables handling and parsing of opml files"""
-
-    def get_rss_feeds(self, filename):
-        """
-        returns list of rss feeds in the opml file
-        @param filename The OPML file
-        @return list(String) List of RSS feed urls
-        """
-        feeds = []
-        if os.path.isfile(filename):
-            #this loads the xml from the opml file into xmldoc
-            xmldoc = minidom.parse(filename)
-        else:
-            xmldoc = minidom.parse(urllib.urlopen(filename))
-        #the rss feeds are in the xmlUrl attributes of the outline tags
-        #we loop through all the outline nodes in the opml file and add
-        #the contents of any xmlUrl attributes to the feeds variable
-        for node in xmldoc.getElementsByTagName('outline'):
-            url = node.getAttribute('xmlUrl')
-            #drop any items which are .opml files or empty string
-            #We do not recursively parse opml links as we could end up with an
-            #infinite loop
-            if (url.strip() != "") and ((url.strip() [-5:]) != ".opml"):
-                feeds.append(url)
-        #returns the list of rss feeds from the opml file
-        return feeds
-
-    def get_liferea_opml(self, home_dir=os.path.expanduser("~")):
-        """
-        this returns either a empty string or the path to the current liferea
-        opml file
-
-        @param home_dir String defaults to ~
-        @return String Path to opml file
-        """
-        #we'll be storing the latest liferea config folder in path and the
-        #version number, if any, in curVersion
-        path = ""
-        curVersion = float(0.0)
-
-        #loop through home and pick out any config folders matching .liferea*
-        filenames = [filename for filename in os.listdir(home_dir)
-            if filename.startswith(".liferea")]
-
-        if (len(filenames) <= 0):
-            #if there aren't any folders return an empty string
-            return ""
-        elif (len(filenames) == 1):
-            #if there's only 1 path found set it as the path
-            path = filenames[0]
-        else:
-            #in this case we have multiple posibilities
-            #liferea will store the config folder as .liferea or .liferea_9.9
-            #with 9.9 being the version number
-            #all we have todo is pick the largest version number or just the
-            #.liferea folder in that older
-            for fname in filenames:
-                if (fname [-3:] == "rea"):
-                    if (curVersion == 0.0):
-                        path = fname
-                elif (float(fname [-3:])> curVersion):
-                    curVersion = float(fname [-3:])
-                    path = fname
-
-        #check if the path variable gives us a valid path and return it if it
-        #does or an empty string if it doesn't
-        if os.path.isfile(home_dir + "/" + path + "/feedlist.opml"):
-            return home_dir + "/" + path + "/feedlist.opml"
-        else:
-            return ""
-
-class FeedConfigTools:
-    """Enables Handling of Feed Config Widgets"""
-
-    def __init__(self):
-        """Initialize to get access to the Configuration object"""
-        self.config = Configuration()
-
-    def add_file_feeds_to_widget(self, files, model, feeds, check=True):
-        """
-        This changes the input values so that the feeds in the files update
-        the other inputs
-
-        @param files list(String)
-        @param model GTKModel?
-        @param feeds list(String)
-        """
-        feed_list = []
-        for opml_file in files:
-            #get the list of feeds from each file
-            opml_feeds = OPMLParser().get_rss_feeds(opml_file)
-            #add the feeds to the rss_list
-            for feed in opml_feeds:
-                feed_list.append(feed)
-        #only check if check is set to True
-        if(check):
-            #check if the user really wants to add
-            dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL,
-                gtk.MESSAGE_WARNING, gtk.BUTTONS_OK_CANCEL,
-                "This will add " + str(len(feed_list)) +
-                " feeds to your feed list. Continue?")
-
-            status = dialog.run()
-            #If user has ok'd the request we can now add the feeds properly,
-            #else leave it
-            if(status == gtk.RESPONSE_OK):
-                #now we need append the feeds to self.feeds and content manager
-                self.add_feeds_to_widget(feed_list, model, feeds)
-            dialog.destroy()
-        else:
-            #now we need append the feeds to self.feeds and content manager
-            self.add_feeds_to_widget(feed_list, model, feeds)
-
-    def add_feeds_to_widget(self, feed_list, model, feeds):
-        """
-        This changes the input values so that the feeds in feed_list update
-        the other inputs
-
-        @param feed_list list(String)
-        @param model GTKModel?
-        @param feeds list(String)
-        """
-        try:
-            for feed in feed_list:
-                #drop any items which are .opml files
-                #We do not recursively parse opml links as we could end up
-                #with an infinite loop
-                if (feed [-5:]) != ".opml":
-                    #this is adding the feed to the content manager widget
-                    model.append([feed])
-                    feeds.append(feed)
-            #now we can parse the new feeds and add them
-            str_folders = ";".join(feeds)
-            self.config.write_content_value("RSS", "feeds", str_folders)
-        except IOError:
-            #Catching IOError
-            error = gtk.MessageDialog(None, gtk.DIALOG_MODAL,
-                gtk.MESSAGE_ERROR, gtk.BUTTONS_OK,
-                "IOError: There seems to be a problem with your selection.")
-            error.run()
-            error.destroy()
-

=== modified file 'entertainerlib/backend/core/message_type_priority.py'
--- entertainerlib/backend/core/message_type_priority.py	2009-09-08 00:53:03 +0000
+++ entertainerlib/backend/core/message_type_priority.py	2010-04-03 15:04:16 +0000
@@ -21,21 +21,12 @@
     # Indicates that Content Management UI has been used to update contents.
     CONTENT_CONF_UPDATED = 0
 
-    # Indicates that Feed cache has been updated.
-    FEED_DB_UPDATED = 1
-
-    # Indicates that Feed cache should be updated.
-    UPDATE_FEEDS = 2
-
     # Require to rebuild image cache
-    REBUILD_IMAGE_CACHE = 3
+    REBUILD_IMAGE_CACHE = 1
 
     # Require to rebuild music cache
-    REBUILD_MUSIC_CACHE = 4
+    REBUILD_MUSIC_CACHE = 2
 
     # Require to rebuild video cache
-    REBUILD_VIDEO_CACHE = 5
-
-    # Require to rebuild feed cache
-    REBUILD_FEED_CACHE = 6
+    REBUILD_VIDEO_CACHE = 3
 

=== removed file 'entertainerlib/client/backend_connection.py'
--- entertainerlib/client/backend_connection.py	2009-09-08 02:40:16 +0000
+++ entertainerlib/client/backend_connection.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Connection to the Entertainer backend'''
-
-from entertainerlib.backend.core.message import Message
-from entertainerlib.backend.core.message_bus_proxy import MessageBusProxy
-from entertainerlib.backend.core.message_type_priority import MessageType
-from entertainerlib.backend.core.message_handler import MessageHandler
-
-class BackendConnection(MessageHandler):
-    """Connection to the Entertainer backend messagebus."""
-
-    def __init__(self):
-        MessageHandler.__init__(self)
-        messages = {}
-        name = "Entertainer Frontend"
-        self.message_bus_proxy = MessageBusProxy(messages, self, name)
-        self.message_bus_proxy.connectToMessageBus()
-        self.message_bus_proxy.start()
-
-    def close_connection(self):
-        """Close connection to backend"""
-        self.message_bus_proxy.disconnectFromMessageBus()
-
-    def request_feed_update(self):
-        """Request backend to fetch all feeds from the Internet."""
-        self.message_bus_proxy.sendMessage(Message(MessageType.UPDATE_FEEDS))
-

=== modified file 'entertainerlib/client/client.py'
--- entertainerlib/client/client.py	2010-01-03 22:58:00 +0000
+++ entertainerlib/client/client.py	2010-04-03 15:04:16 +0000
@@ -10,8 +10,6 @@
 from twisted.internet.protocol import ClientCreator
 from twisted.python.log import startLogging
 
-from entertainerlib.client.backend_connection import BackendConnection
-from entertainerlib.client.medialibrary.feeds import FeedLibrary
 from entertainerlib.client.medialibrary.music import MusicLibrary
 from entertainerlib.client.medialibrary.images import ImageLibrary
 from entertainerlib.client.medialibrary.videos import VideoLibrary
@@ -21,20 +19,17 @@
 from entertainerlib.network.local.client import EntertainerLocalClientProtocol
 
 
-class Client:
-    '''This is a client application of the Entertainer. Entertainer's client
+class Client(object):
+    '''This is a client application of Entertainer. Entertainer's client
     hooks into the server, and then provides a user interface for the data the
     server creates.'''
 
     def __init__(self):
         config = Configuration()
-        self.backend_connection = BackendConnection()
-        feed_library = FeedLibrary(self.backend_connection)
         music_library = MusicLibrary()
         image_library = ImageLibrary()
         video_library = VideoLibrary()
-        self.ui = UserInterface(
-            feed_library, image_library, music_library, video_library,
+        self.ui = UserInterface(image_library, music_library, video_library,
             self.quit_client)
 
         if config.tray_icon_enabled:
@@ -56,9 +51,7 @@
         gtk.gdk.threads_leave()
 
     def quit_client(self):
-        '''Clean up the connection to the backend then close the client.'''
-        self.backend_connection.close_connection()
-
+        '''Close the client.'''
         reactor.stop()
         sys.exit(0)
 

=== removed file 'entertainerlib/client/medialibrary/feeds.py'
--- entertainerlib/client/medialibrary/feeds.py	2009-07-29 03:09:34 +0000
+++ entertainerlib/client/medialibrary/feeds.py	1970-01-01 00:00:00 +0000
@@ -1,192 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''FeedLibrary - Library for RSS-feeds'''
-
-from pysqlite2 import dbapi2 as sqlite
-
-from entertainerlib.configuration import Configuration
-
-class FeedLibrary(object):
-    '''This library can be used to handle RSS feeds in Entertainer.'''
-
-    def __init__(self, backend_connection):
-        self.config = Configuration()
-
-        self.backend_connection = backend_connection
-        self.empty = False
-        if self.number_of_feeds() == 0:
-            self.empty = True
-
-    def is_empty(self):
-        '''Boolean used to indicated if the feed library is empty.'''
-        return self.empty
-
-    def get_feeds(self, order='TITLE'):
-        '''Return a list of Feed objects from the library based on the order of
-        TITLE or UNREAD.'''
-        if self.is_empty():
-            return []
-        else:
-            feeds = []
-            connection = sqlite.connect(self.config.FEED_DB)
-            cursor = connection.cursor()
-            cursor.execute("SELECT url FROM feed ORDER BY title")
-            for row in cursor:
-                feeds.append(Feed(row[0]))
-            connection.close()
-            if order == "UNREAD":
-                feeds.sort(self.compare_feeds_by_unread)
-            return feeds
-
-    def compare_feeds_by_unread(self, feed_x, feed_y):
-        '''Compare which feed has more unread and return a value that follows
-        Python's cmp convention of +, 0, or -.'''
-        return cmp(
-            feed_y.get_number_of_unread(),
-            feed_x.get_number_of_unread())
-
-    def get_latest_entries(self, max_return=10):
-        '''Return the latest entries as a list of tuples with each tuple
-        containing a Feed object and an Entry object.'''
-        if self.is_empty():
-            return []
-        else:
-            latest = []
-            connection = sqlite.connect(self.config.FEED_DB)
-            cursor = connection.cursor()
-            cursor.execute("""SELECT DISTINCT feed.url, entry.id
-                              FROM feed, entry
-                              WHERE entry.feed_url = feed.url
-                              ORDER BY entry.date DESC, entry.time  DESC
-                              LIMIT 0,:max""",
-                              { "max" : max_return } )
-            for row in cursor:
-                feed = Feed(row[0])
-                entry = feed.get_entry(row[1])
-                latest.append((feed, entry))
-            connection.close()
-            return latest
-
-    def number_of_feeds(self):
-        '''Return the number of feeds in the library.'''
-        if self.is_empty():
-            return 0
-        else:
-            connection = sqlite.connect(self.config.FEED_DB)
-            cursor = connection.cursor()
-            cursor.execute("SELECT COUNT(url) FROM feed")
-            result = cursor.fetchall()
-            connection.close()
-            return result[0][0]
-
-    def number_of_unread_entries(self):
-        '''Return the number of unread entries.'''
-        if self.is_empty():
-            return 0
-        else:
-            connection = sqlite.connect(self.config.FEED_DB)
-            cursor = connection.cursor()
-            cursor.execute(
-                """SELECT COUNT(feed_url) FROM entry WHERE isread='NO'""")
-            result = cursor.fetchall()
-            connection.close()
-            return result[0][0]
-
-    def request_feed_update(self):
-        '''Request backend to fetch and update all the feeds.'''
-        self.backend_connection.request_feed_update()
-
-    def mark_all_as_read(self):
-        '''Mark all feed entries as read.'''
-        for feed in self.get_feeds():
-            for entry in feed.entries:
-                entry.read = True
-
-
-class Feed(object):
-    '''Representation of a RSS feed.'''
-
-    def __init__(self, url):
-        self.config = Configuration()
-
-        self.url = url
-        self.entries = []
-        connection = sqlite.connect(self.config.FEED_DB)
-        cursor = connection.cursor()
-        cursor.execute("""SELECT title, subtitle, description, time, date
-                          FROM feed
-                          WHERE url=:url""",
-                          { "url" : self.url })
-        result = cursor.fetchall()
-        self.title = result[0][0]
-        self.subtitle = result[0][1]
-        self.description = result[0][2]
-        self.time = result[0][3]
-        self.date = result[0][4]
-        cursor.execute("""SELECT title, description, id, time, date, isread
-                          FROM entry
-                          WHERE entry.feed_url=:url
-                          ORDER BY date DESC, time DESC""",
-                          { "url" : self.url })
-        for row in cursor:
-            if row[5] == "YES":
-                isread = True
-            else:
-                isread = False
-            self.entries.append(
-                Entry(row[0], row[1], row[2], row[3], row[4], isread))
-        connection.close()
-
-    def get_entry(self, identifier):
-        '''Return an entry with the provided identifier.'''
-        for entry in self.entries:
-            if entry.identifier == identifier:
-                return entry
-
-    def get_number_of_unread(self):
-        '''Return the number of unread entries.'''
-        connection = sqlite.connect(self.config.FEED_DB)
-        cursor = connection.cursor()
-        cursor.execute("""SELECT COUNT(feed_url)
-                          FROM   entry
-                          WHERE  isread='NO'
-                          AND    feed_url=:url""",
-                          { "url" : self.url })
-        result = cursor.fetchall()
-        connection.close()
-        return int(result[0][0])
-
-
-class Entry(object):
-    '''Representation of an individual RSS feed entry.'''
-
-    def __init__(self, title, description, identifier, time, date, read=False):
-        self.config = Configuration()
-        self.title = title
-        self.description = description
-        self.identifier = identifier
-        self.time = time
-        self.date = date
-        self._read = read
-
-    def _get_read(self):
-        '''Get the read property.'''
-        return self._read
-
-    def _set_read(self, read):
-        '''Set the read property and update the database.'''
-        self._read = read
-
-        if read:
-            readval = "YES"
-        else:
-            readval = "NO"
-        connection = sqlite.connect(self.config.FEED_DB)
-        cursor = connection.cursor()
-        cursor.execute(
-            """UPDATE entry SET isread=:val WHERE id=:id""",
-            {"val" : readval, "id" : self.identifier})
-        connection.commit()
-        connection.close()
-
-    read = property(_get_read, _set_read)
-

=== modified file 'entertainerlib/client/medialibrary/music.py'
--- entertainerlib/client/medialibrary/music.py	2010-01-03 22:58:00 +0000
+++ entertainerlib/client/medialibrary/music.py	2010-04-03 15:04:16 +0000
@@ -171,6 +171,7 @@
 
     def __init__(self, filename, title, number, artist, album, year, length,
         lyrics, create_album_callback):
+        Playable.__init__(self)
 
         # Check that these fields are integers
         for field in [number, year, length]:
@@ -318,6 +319,7 @@
     '''Representation of a CD track.'''
 
     def __init__(self, number, title, length):
+        Playable.__init__(self)
         self.title = title
         self.uri = "cdda://" + str(number)
         self.length = length

=== modified file 'entertainerlib/client/medialibrary/videos.py'
--- entertainerlib/client/medialibrary/videos.py	2009-09-08 02:40:16 +0000
+++ entertainerlib/client/medialibrary/videos.py	2010-04-03 15:04:16 +0000
@@ -4,10 +4,10 @@
 import os
 from pysqlite2 import dbapi2 as sqlite
 
+from entertainerlib.client.medialibrary.playable import Playable
 from entertainerlib.configuration import Configuration
 from entertainerlib.logger import Logger
 
-from entertainerlib.client.medialibrary.playable import Playable
 
 class VideoLibrary:
     """Interface for Entertainer's video cache."""
@@ -120,6 +120,7 @@
 
     def __init__(self):
         """Initialize the VideoItem object"""
+        Playable.__init__(self)
         self.config = Configuration()
 
         #Setting default values

=== modified file 'entertainerlib/client/translation_setup.py'
--- entertainerlib/client/translation_setup.py	2009-11-11 10:22:36 +0000
+++ entertainerlib/client/translation_setup.py	2010-04-03 15:04:16 +0000
@@ -1,11 +1,10 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Translation Setup Code'''
 
+import gettext
 import locale
 import os
 
-import gettext
-import gtk
 from xdg import BaseDirectory
 
 class TranslationSetup:
@@ -27,7 +26,7 @@
             # this hack it's really needed.
             try:
                 locale.setlocale(locale.LC_ALL, "")
-            except locale.Error, e:
+            except locale.Error:
                 pass
 
         # Find locale data from a dev branch if we can

=== modified file 'entertainerlib/configuration.py'
--- entertainerlib/configuration.py	2009-08-27 03:18:41 +0000
+++ entertainerlib/configuration.py	2010-04-03 15:04:16 +0000
@@ -38,7 +38,6 @@
 
             self.MEDIA_DB = Database(os.path.join(self.cache_dir, 'media'))
 
-            self.FEED_DB = os.path.join(self.cache_dir, 'feed.db')
             self.IMAGE_DB = os.path.join(self.cache_dir, 'image.db')
             self.MUSIC_DB = os.path.join(self.cache_dir, 'music.db')
             self.VIDEO_DB = os.path.join(self.cache_dir, 'video.db')
@@ -133,11 +132,6 @@
         return self.content.getboolean("General", "display_icon")
 
     @property
-    def feed_fetch_interval(self):
-        '''Time interval (in minutes) for feed fetching.'''
-        return self.content.getint("RSS", "fetch_interval")
-
-    @property
     def port(self):
         '''Server's port number.'''
         return self.content.getint("General", "backend_port")
@@ -149,12 +143,6 @@
         return self._is_valid_media_folder(media.split(';'))
 
     @property
-    def feeds(self):
-        '''List of feeds.'''
-        rss_feeds = self.content.get("RSS", "feeds")
-        return rss_feeds.split(';')
-
-    @property
     def weather_location(self):
         '''User's weather location.'''
         return self.content.get("Weather", "location")

=== modified file 'entertainerlib/db/models.py'
--- entertainerlib/db/models.py	2009-06-17 02:53:31 +0000
+++ entertainerlib/db/models.py	2010-04-03 15:04:16 +0000
@@ -3,7 +3,7 @@
 # pylint: disable-msg=W0621,W0223
 
 from storm.base import Storm
-from storm.properties import Bool, DateTime, Int, Unicode
+from storm.properties import DateTime, Int, Unicode
 from storm.references import Reference, ReferenceSet
 
 
@@ -14,58 +14,6 @@
         '''Convert model into a static dict.'''
         raise NotImplementedError
 
-class NewsFeed(BaseModel):
-    '''A source url for news'''
-
-    __storm_table__ = 'newsfeed'
-    id = Int(primary=True)
-    url = Unicode()
-    title = Unicode()
-    description = Unicode()
-    entries = ReferenceSet('NewsFeed.id', 'NewsEntry.feed_id')
-
-    def to_dict(self, recurse=True):
-        '''See BaseModel.to_dict.'''
-        ret = {
-            'id': self.id,
-            'url': self.url,
-            'title': self.title,
-            'description': self.description,
-            }
-        if recurse:
-            ret['entries'] = [entry.to_dict(recurse=False)
-                for entry in self.entries]
-        return ret
-
-
-class NewsEntry(BaseModel):
-    '''A news article'''
-
-    __storm_table__ = 'newsentry'
-    id = Int(primary=True)
-    url = Unicode()
-    title = Unicode()
-    description = Unicode()
-    creation_date = DateTime()
-    is_read = Bool()
-    feed_id = Int()
-    feed = Reference(feed_id, 'NewsFeed.id')
-
-    def to_dict(self, recurse=True):
-        '''See BaseModel.to_dict.'''
-        ret = {
-            'id': self.id,
-            'url': self.url,
-            'title': self.title,
-            'description': self.description,
-            'creation_date': self.creation_date,
-            'is_read': self.is_read,
-            }
-        if recurse:
-            ret['feed_id'] = self.feed_id
-            ret['feed'] = self.feed.to_dict(recurse=False)
-        return ret
-
 
 class PhotoAlbum(BaseModel):
     '''A photo group'''

=== modified file 'entertainerlib/dialog.py'
--- entertainerlib/dialog.py	2009-11-13 16:25:41 +0000
+++ entertainerlib/dialog.py	2010-04-03 15:04:16 +0000
@@ -16,8 +16,6 @@
 from entertainerlib.configuration import Configuration
 from entertainerlib.logger import Logger
 from entertainerlib.gui.theme import Theme
-from entertainerlib.backend.components.feeds.feed_utils import (OPMLParser,
-    FeedConfigTools)
 from entertainerlib.weather import Weather
 
 
@@ -52,8 +50,6 @@
         if (self.dialog):
             callback_dic = {
                 # Dialog-wide callbacks
-                "on_button_open_list_clicked" :
-                    self.on_button_open_list_clicked,
                 "on_close_button_clicked" : self.on_close_button_clicked,
                 "on_ManagerDialog_destroy" : self.on_dialog_closed,
 
@@ -71,23 +67,6 @@
                 "on_button_media_rebuild_clicked" :
                     self.on_button_media_rebuild_clicked,
 
-                # Feed tab
-                "on_button_add_feed_clicked" :
-                    self.on_button_add_feed_clicked,
-                "on_button_remove_feed_clicked" :
-                    self.on_button_remove_feed_clicked,
-                "on_button_edit_feed_clicked" :
-                    self.on_button_edit_feed_clicked,
-                "on_fetch_interval_spinbutton_value_changed" :
-                    self.on_fetch_interval_spinbutton_value_changed,
-                "on_url_dialog_delete_event" : self.on_url_dialog_delete_event,
-                "on_url_dialog_ok_button_clicked" :
-                    self.on_url_dialog_ok_button_clicked,
-                "on_url_dialog_cancel_button_clicked" :
-                    self.on_url_dialog_cancel_button_clicked,
-                "on_button_feed_rebuild_clicked" :
-                    self.on_button_feed_rebuild_clicked,
-
                 # Weather tab
                 "on_button_add_weather_clicked" :
                     self.on_button_add_weather_clicked,
@@ -253,68 +232,6 @@
         self.config.write_content_value("Media", "download_metadata",
             widget.get_active())
 
-    def on_button_add_feed_clicked(self, widget):
-        """Opens add feed dialog. """
-        widget = self.builder.get_object("treeview_feeds")
-        url_dialog = self.builder.get_object("url_dialog")
-        model = widget.get_model()
-        # Open dialog
-        url_dialog.set_title(_("Add RSS-feed"))
-        status = url_dialog.run()
-        # If folder was selected we add it to model and update config file
-        if(status == gtk.RESPONSE_OK):
-            model.append([self.url])
-            self.feeds.append(self.url)
-            str_folders = ";".join(self.feeds)
-            self.config.write_content_value("RSS", "feeds", str_folders)
-
-    def on_button_remove_feed_clicked(self, widget):
-        """Remove currently selected reed from RSS-feeds"""
-        widget = self.builder.get_object("treeview_feeds")
-        model = widget.get_model()
-        selection = widget.get_selection().get_selected()
-        if selection[1] == None:
-            return
-        rm_folder = model.get_value(selection[1], 0)
-        self.feeds.remove(rm_folder)
-        str_folders = ";".join(self.feeds)
-        self.config.write_content_value("RSS", "feeds", str_folders)
-        model.remove(selection[1])
-
-    def on_button_edit_feed_clicked(self, widget):
-        """Edit currently selected feed"""
-        widget = self.builder.get_object("treeview_feeds")
-        url_dialog = self.builder.get_object("url_dialog")
-        url_entry = self.builder.get_object("url_entry")
-        model = widget.get_model()
-        selection = widget.get_selection().get_selected()
-        if selection[1] == None:
-            return
-        feed = model.get_value(selection[1], 0)
-        url_entry.set_text(feed)
-        url_dialog.set_title(_("Edit feed"))
-        status = url_dialog.run()
-        if status == gtk.RESPONSE_OK:
-            # Update list model
-            model.set_value(selection[1], 0, self.url)
-            # Update configure file
-            pos = self.feeds.index(feed)
-            self.feeds.remove(feed)
-            self.feeds.insert(pos, self.url)
-            str_feeds = ";".join(self.feeds)
-            self.config.write_content_value("RSS", "feeds", str_feeds)
-
-    def on_button_open_list_clicked(self, widget):
-        """Opens the open feed source dialog"""
-        open_dialog = OpenFeedSourceDialog(
-            self.builder.get_object("treeview_feeds"), self.feeds)
-        open_dialog.dialog.connect("destroy",
-            open_dialog.on_closeButton_clicked)
-
-    def on_fetch_interval_spinbutton_value_changed(self, widget):
-        self.config.write_content_value("RSS", "fetch_interval",
-            widget.get_value_as_int())
-
     def on_spinbutton_slideshow_step_value_changed(self, widget):
         """Activation of slideshow effects"""
         self.config.write_content_value("Photographs", "slideshow_step",
@@ -328,32 +245,6 @@
         self.config.write_content_value("Media", "download_album_art",
             widget.get_active())
 
-    def on_url_dialog_ok_button_clicked(self, widget):
-        """URL dialog OK button pressed. Sets self.url"""
-        url_dialog = self.builder.get_object("url_dialog")
-        url_entry = self.builder.get_object("url_entry")
-        url_dialog.hide()
-        self.url = url_entry.get_text()
-        url_entry.set_text("")
-        url_dialog.response(gtk.RESPONSE_OK)
-
-    def on_url_dialog_cancel_button_clicked(self, widget):
-        """URL dialog cancelled. Hides dialog"""
-        url_dialog = self.builder.get_object("url_dialog")
-        url_entry = self.builder.get_object("url_entry")
-        url_dialog.hide()
-        url_entry.set_text("")
-        url_dialog.response(gtk.RESPONSE_CANCEL)
-
-    def on_url_dialog_delete_event(self, widget, data):
-        """Dialog's X clicked. Hides dialog"""
-        url_dialog = self.builder.get_object("url_dialog")
-        url_entry = self.builder.get_object("url_entry")
-        url_dialog.hide()
-        url_entry.set_text("")
-        url_dialog.response(gtk.RESPONSE_CANCEL)
-        return True
-
     def on_button_add_weather_clicked(self, widget):
         """
         Open location search dialog
@@ -489,35 +380,6 @@
             error.run()
             error.destroy()
 
-    def on_button_feed_rebuild_clicked(self, widget):
-        """
-        Rebuild feed cache requested
-        @param widget: GTK-Widget
-        """
-        #We need the user to confirm the rebuild feed cache request
-        dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING,
-            gtk.BUTTONS_OK_CANCEL,
-            _("This will completely remove any feed entries in the cache!"))
-        status = dialog.run()
-        #If user has ok'd the request send the message to the message bus
-        if(status == gtk.RESPONSE_OK):
-            try:
-                proxy = MessageBusProxy(client_name = "Manager GUI")
-                proxy.connectToMessageBus()
-                proxy.sendMessage(Message(MessageType.REBUILD_FEED_CACHE))
-                proxy.disconnectFromMessageBus()
-            except socket.error:
-                error = gtk.MessageDialog(
-                    None, gtk.DIALOG_MODAL,
-                    gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, _(
-                        "Entertainer backend is not running. "
-                        "Cache cannot be rebuilt."
-                    ))
-                error.run()
-                error.destroy()
-
-        dialog.destroy()
-
     def on_theme_add_button_clicked(self, widget):
         """Add theme button clicked"""
         themelist = self.builder.get_object("theme_list")
@@ -654,31 +516,6 @@
         lyrics_checkbox = self.builder.get_object("lyrics_checkbox")
         lyrics_checkbox.set_active(self.config.download_lyrics)
 
-        # == RSS-feeds ==
-        feedlist_widget = self.builder.get_object("treeview_feeds")
-        feed_model = gtk.ListStore(str)
-
-        rss_cell = gtk.CellRendererText()
-        rss_column = gtk.TreeViewColumn(_("Feeds"), rss_cell, text=0)
-        feedlist_widget.append_column(rss_column)
-
-        self.feeds = self.config.feeds
-
-        # Fill model with folders read from config file
-        for i in range(len(self.feeds)):
-            feed_model.insert(i, [self.feeds[i]])
-
-        feedlist_widget.set_model(feed_model)
-
-        # Interval spinner
-        interval_spinner = self.builder.get_object("fetch_interval_spinbutton")
-        interval_val = self.config.feed_fetch_interval
-        if interval_val < 15:
-            interval_val = 15
-        elif interval_val > 900:
-            interval_val = 900
-        interval_spinner.set_value(interval_val)
-
         # == Weather ==
         locationlist_widget = self.builder.get_object("treeview_locations")
         location_model = gtk.ListStore(str)
@@ -976,138 +813,3 @@
         return [row[0], row[1], "INFO",
             row[2] + ": " + row[3][4:]]
 
-
-class OpenFeedSourceDialog:
-    '''Feed source reader dialog'''
-
-    UI_DIR = os.path.join(os.path.dirname(__file__), "uis")
-
-    widgets = None
-    dialog = None
-    tree_widget = None
-    feeds = None
-    url = None
-
-    def __init__(self, the_widget, the_feeds):
-        """initialises the gtk window and displays it"""
-
-        #feeds is a pointer to a list of feeds from the config file
-        self.feeds = the_feeds
-
-        #needed so we can add feeds to the feed list widget
-        self.tree_widget = the_widget
-
-        # Load UI with gtk.Builder
-        uifile = os.path.join(self.UI_DIR, "open_feed_source_dialog.ui")
-        self.builder = gtk.Builder()
-        self.builder.set_translation_domain('entertainer')
-        self.builder.add_from_file(uifile)
-
-        # Get content management dialog and bind signal callbacks
-        self.dialog = self.builder.get_object("open_source_dialog")
-        if (self.dialog):
-            callback_dic = {
-                "on_fileOpen_clicked" : self.on_fileOpen_clicked,
-                "on_lifereaButton_clicked" : self.on_lifereaButton_clicked,
-                "on_enterURL_clicked" : self.on_enterURL_clicked,
-                "on_closeButton_clicked" : self.on_closeButton_clicked,
-                "on_url_dialog_ok_button_clicked" :
-                    self.on_url_dialog_ok_button_clicked,
-                "on_url_dialog_cancel_button_clicked" :
-                    self.on_url_dialog_cancel_button_clicked,
-                "on_url_dialog_delete_event" : self.on_url_dialog_delete_event,
-                "on_destroy" : self.on_closeButton_clicked
-                 }
-
-        self.builder.connect_signals(callback_dic)
-
-        # Initilize dialog widgets with correct values and show dialog
-        self.dialog.resize(300, 200)
-        self.dialog.run()
-
-    def on_fileOpen_clicked(self, widget):
-        """Opens add file dialog and then adds all feeds in the opml file
-        selected """
-
-        #get the model for the feed list widget so we can add the new feeds
-        model = self.tree_widget.get_model()
-
-        #create select file dialog
-        dialog = gtk.FileChooserDialog(_("Select OPML file"), None,
-            gtk.FILE_CHOOSER_ACTION_OPEN,
-            (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN,
-                gtk.RESPONSE_OK))
-
-        #set dialog up to filter for only opml files
-        file_filter = gtk.FileFilter()
-        file_filter.set_name(_("OPML files"))
-        file_filter.add_pattern("*.opml")
-        dialog.add_filter(file_filter)
-
-        #set dialog up to allow multiple selections
-        dialog.set_select_multiple(True)
-
-        #run the dialog
-        status = dialog.run()
-
-        # if file was selected, get list of feeds from it and add to
-        #model and update config file
-        if(status == gtk.RESPONSE_OK):
-            FeedConfigTools().add_file_feeds_to_widget(
-                dialog.get_filenames(), model, self.feeds)
-        dialog.destroy()
-
-    def on_lifereaButton_clicked(self, widget):
-        """Adds any liferea feeds it finds to the feed widget and config file
-        """
-        #get the model
-        model = self.tree_widget.get_model()
-        #get the liferea feeds and then send everything to the
-        #add_file_feeds_to_widget method
-        FeedConfigTools().add_file_feeds_to_widget(
-            [OPMLParser().get_liferea_opml()], model, self.feeds)
-
-    def on_enterURL_clicked(self, widget):
-        """gets a opml file link from a user and adds any feeds it finds to the
-        feed widget and config file"""
-        url_dialog = self.builder.get_object("url_dialog")
-        model = self.tree_widget.get_model()
-        # Open dialog
-        url_dialog.set_title(_("Add OPML File"))
-        status = url_dialog.run()
-        # If folder was selected we add it to model and update config file
-        if(status == gtk.RESPONSE_OK):
-            FeedConfigTools().add_file_feeds_to_widget([self.url],
-                model, self.feeds)
-
-    def on_closeButton_clicked(self, widget):
-        self.dialog.hide()
-        self.dialog.destroy()
-
-    def on_url_dialog_ok_button_clicked(self, widget):
-        """URL dialog OK button pressed. Sets self.url"""
-        url_dialog = self.builder.get_object("url_dialog")
-        url_entry = self.builder.get_object("url_entry")
-        url_dialog.hide()
-        self.url = url_entry.get_text()
-        url_entry.set_text("")
-        url_dialog.response(gtk.RESPONSE_OK)
-
-    def on_url_dialog_cancel_button_clicked(self, widget):
-        """URL dialog cancelled. Hides dialog"""
-        url_dialog = self.builder.get_object("url_dialog")
-        url_entry = self.builder.get_object("url_entry")
-        url_dialog.hide()
-        url_entry.set_text("")
-        url_dialog.response(gtk.RESPONSE_CANCEL)
-
-    def on_url_dialog_delete_event(self, widget, data):
-        """Dialog's X clicked. Hides dialog"""
-        url_dialog = self.builder.get_object("url_dialog")
-        url_entry = self.builder.get_object("url_entry")
-        url_dialog.hide()
-        url_entry.set_text("")
-        url_dialog.response(gtk.RESPONSE_CANCEL)
-        return True
-
-

=== modified file 'entertainerlib/download.py'
--- entertainerlib/download.py	2009-07-14 04:24:07 +0000
+++ entertainerlib/download.py	2010-04-03 15:04:16 +0000
@@ -95,7 +95,7 @@
         # Strip
         str_input = str_input.strip ()
 
-        # TODO: Convert accented to unaccented
+        # XXX: Convert accented to unaccented
         str_input = str_input.replace (" - ", " ")
         str_input = str_input.replace (": ", " ")
         str_input = str_input.replace (" & ", " and ")
@@ -144,7 +144,7 @@
         self.search_artist = st_artist
         self.search_album_no_vol = st_album_no_vol
 
-        # TODO: Improve to decrease wrong cover downloads, maybe add severity?
+        # XXX: Improve to decrease wrong cover downloads, maybe add severity?
         # Assemble list of search keywords (and thus search queries)
         if st_album == u'Unknown':
             self.keywords.append ("%s Best of" % (st_artist))
@@ -400,7 +400,7 @@
 
         # Convert title and artist to use in url, special symbols have to be
         # replaced by a '%' not '%xx'
-        # TODO: Find out what the special symbols are (', &, ...)
+        # XXX: Find out what the special symbols are (', &, ...)
         # not letters, digits, spaces and ()$^*=:;|#@}{][!,.-_\
         self.artist = urllib.quote(self.artist.encode('utf-8'),
                                    "'&()$^*=:;|#@}{][!,\\")

=== modified file 'entertainerlib/gui/screens/factory.py'
--- entertainerlib/gui/screens/factory.py	2009-12-22 00:34:27 +0000
+++ entertainerlib/gui/screens/factory.py	2010-04-03 15:04:16 +0000
@@ -5,8 +5,6 @@
 from entertainerlib.gui.screens.album import Album
 from entertainerlib.gui.screens.audio_play import AudioPlay
 from entertainerlib.gui.screens.disc import Disc
-from entertainerlib.gui.screens.feed import Feed
-from entertainerlib.gui.screens.feed_entry import FeedEntry
 from entertainerlib.gui.screens.main import Main
 from entertainerlib.gui.screens.movie import Movie
 from entertainerlib.gui.screens.music import Music
@@ -14,7 +12,6 @@
 from entertainerlib.gui.screens.photo_albums import PhotoAlbums
 from entertainerlib.gui.screens.photographs import Photographs
 from entertainerlib.gui.screens.question import Question
-from entertainerlib.gui.screens.rss import Rss
 from entertainerlib.gui.screens.tv_episodes import TvEpisodes
 from entertainerlib.gui.screens.tv_series import TvSeries
 from entertainerlib.gui.screens.video import Video
@@ -25,15 +22,14 @@
 class ScreenFactory(object):
     '''Generate a screen based on the type provided.'''
 
-    def __init__(self, feed_library, image_library, music_library,
-        video_library, media_player, move_to_new_screen_callback,
+    def __init__(self, image_library, music_library, video_library,
+        media_player, move_to_new_screen_callback,
         move_to_previous_screen_callback):
         '''All the possible common things that a screen could use to initialize
         are factory instance variables. Any additional specific information
         needed for a screen will be provided in a dictionary that is received
         by the generate_screen method.'''
 
-        self.feed_library = feed_library
         self.image_library = image_library
         self.music_library = music_library
         self.video_library = video_library
@@ -54,8 +50,6 @@
             'artist' : self._generate_artist,
             'audio_cd' : self._generate_disc,
             'audio_play' : self._generate_audio_play,
-            'entry' : self._generate_feed_entry,
-            'feed' : self._generate_feed,
             'main' : self._generate_main,
             'movie' : self._generate_movie,
             'music' : self._generate_music,
@@ -63,7 +57,6 @@
             'photo_albums' : self._generate_photo_albums,
             'photographs' : self._generate_photographs,
             'question' : self._generate_question,
-            'rss' : self._generate_rss,
             'tv_episodes' : self._generate_tv_episodes,
             'tv_series' : self._generate_tv_series,
             'video' : self._generate_video,
@@ -99,18 +92,8 @@
         kwargs['music_library'] = self.music_library
         return Disc(**kwargs)
 
-    def _generate_feed(self, kwargs):
-        '''Generate a Feed screen.'''
-        kwargs['move_to_new_screen_callback'] = self.move_to_new_screen_callback
-        return Feed(**kwargs)
-
-    def _generate_feed_entry(self, kwargs):
-        '''Generate a FeedEntry screen.'''
-        return FeedEntry(**kwargs)
-
     def _generate_main(self, kwargs):
         '''Generate a Main screen.'''
-        kwargs['feed_library'] = self.feed_library
         kwargs['media_player'] = self.media_player
         kwargs['move_to_new_screen_callback'] = self.move_to_new_screen_callback
         return Main(**kwargs)
@@ -149,12 +132,6 @@
             self.move_to_previous_screen_callback
         return Question(**kwargs)
 
-    def _generate_rss(self, kwargs):
-        '''Generate a Rss screen.'''
-        kwargs['feed_library'] = self.feed_library
-        kwargs['move_to_new_screen_callback'] = self.move_to_new_screen_callback
-        return Rss(**kwargs)
-
     def _generate_tv_series(self, kwargs):
         '''Generate a TvSeries screen.'''
         kwargs['move_to_new_screen_callback'] = self.move_to_new_screen_callback

=== removed file 'entertainerlib/gui/screens/feed.py'
--- entertainerlib/gui/screens/feed.py	2009-07-29 03:09:34 +0000
+++ entertainerlib/gui/screens/feed.py	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Feed - Screen that contains a list of entries in one feed'''
-
-import pango
-
-from entertainerlib.gui.screens.screen import Screen
-from entertainerlib.gui.widgets.label import Label
-from entertainerlib.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.gui.widgets.texture import Texture
-from entertainerlib.gui.widgets.text_menu import TextMenu
-from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
-
-class Feed(Screen):
-    '''Screen is displayed when headlines are accessed for a specific feed.'''
-
-    def __init__(self, feed, move_to_new_screen_callback):
-        Screen.__init__(self, 'Feed', move_to_new_screen_callback)
-
-        self.theme = self.config.theme
-        self.feed = feed
-        self.menu = None
-
-        self.menu = self._create_entry_menu()
-        self.add(self.menu)
-
-        # Screen Title (Displayed at the bottom left corner)
-        screen_title = Label(0.13, "screentitle", 0, 0.87, _("Feed"))
-        self.add(screen_title)
-
-        # RSS Icon
-        icon = Texture(self.theme.getImage("rss_icon"), 0.05, 0.07)
-        self.add(icon)
-
-        # RSS Feed Title
-        title_text = FeedEntryParser().convert(self.feed.title)
-        title = Label(0.065, "title", 0.13, 0.07, title_text)
-        title.set_use_markup(True)
-        title.width = 0.6
-        title.set_ellipsize(pango.ELLIPSIZE_END)
-        self.add(title)
-
-        # RSS Feed description
-        desc_text = FeedEntryParser().convert(self.feed.subtitle)
-        desc = Label(0.03646, "subtitle", 0.13, 0.14, desc_text)
-        desc.set_use_markup(True)
-        desc.width = 0.6
-        desc.set_ellipsize(pango.ELLIPSIZE_END)
-        self.add(desc)
-
-        # Last update
-        update = Label(0.0313, "title", 0.78, 0.1, _("Updated"))
-        self.add(update)
-        date_text = self.feed.time[:5]  + " - " +  self.feed.date
-        date = Label(0.0313, "subtitle", 0.78, 0.14, date_text)
-        self.add(date)
-
-        #List indicator
-        self.li = ListIndicator(0.57, 0.9, 0.2, 0.045, ListIndicator.VERTICAL)
-        self.li.set_maximum(len(self.feed.entries))
-        self.add(self.li)
-
-        self._display_selected_feed()
-
-        self.menu.connect('selected', self._on_menu_selected)
-        self.menu.connect('moved', self._display_selected_feed)
-
-    def _create_entry_menu(self):
-        """Create Entries-menu. This menu contains list of entries."""
-        menu = TextMenu(0.2438, 0.2604, 0.5124, 0.0781)
-
-        parser = FeedEntryParser()
-        feeds = self.feed.entries
-        feeds_list = [[parser.strip_tags(feed.title), None, feed] \
-            for feed in feeds]
-        menu.async_add(feeds_list)
-
-        menu.active = True
-
-        return menu
-
-    def _handle_up(self):
-        '''Handle UserEvent.NAVIGATE_UP.'''
-        self.menu.up()
-
-    def _handle_down(self):
-        '''Handle UserEvent.NAVIGATE_DOWN.'''
-        self.menu.down()
-
-    def _handle_select(self, event=None):
-        '''Handle UserEvent.NAVIGATE_SELECT.'''
-        entry = self.menu.selected_userdata
-        kwargs = { 'feed' : self.feed, 'entry' : entry }
-        self.callback("entry", kwargs)
-
-    def _on_menu_selected(self, event=None):
-        '''Handle a *select command* if an item was selected.'''
-        self._handle_select()
-
-    def _display_selected_feed(self, event=None):
-        '''Update of the list indicator'''
-        self.li.set_current(self.menu.selected_index + 1)
-

=== removed file 'entertainerlib/gui/screens/feed_entry.py'
--- entertainerlib/gui/screens/feed_entry.py	2009-08-04 01:09:03 +0000
+++ entertainerlib/gui/screens/feed_entry.py	1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''FeedEntry - Screen displays one entry of some RSS feed'''
-
-import pango
-
-from entertainerlib.gui.screens.screen import Screen
-from entertainerlib.gui.user_event import UserEvent
-from entertainerlib.gui.widgets.label import Label
-from entertainerlib.gui.widgets.scroll_area import ScrollArea
-from entertainerlib.gui.widgets.texture import Texture
-from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
-
-class FeedEntry(Screen):
-    '''Screen displays one feed entry.'''
-
-    def __init__(self, feed, entry):
-        Screen.__init__(self, 'FeedEntry')
-
-        self.theme = self.config.theme
-        self.feed = feed
-        self.entry = entry
-
-        # Screen Title (Displayed at the bottom left corner)
-        screen_title_text = FeedEntryParser().convert(self.feed.title)
-        screen_title = Label(0.13, "screentitle", 0, 0.87, screen_title_text)
-        screen_title.set_ellipsize(pango.ELLIPSIZE_END)
-        screen_title.width = 0.8
-        screen_title.set_use_markup(True)
-        self.add(screen_title)
-
-        # RSS Icon
-        icon = Texture(self.theme.getImage("rss_icon"), 0.05, 0.07)
-        self.add(icon)
-
-        # Entry Title
-        title_text = FeedEntryParser().convert(self.feed.title)
-        title = Label(0.065, "title", 0.13, 0.07, title_text)
-        title.set_use_markup(True)
-        title.width = 0.6
-        title.set_ellipsize(pango.ELLIPSIZE_END)
-        self.add(title)
-
-        # RSS Feed descrption
-        full_text = self.entry.title
-        try:
-            sub_title = full_text[:full_text.index('\n')]
-        except ValueError:
-            sub_title = full_text
-        desc_text = FeedEntryParser().convert(sub_title)
-        desc = Label(0.0365, "subtitle", 0.13, 0.14, desc_text)
-        desc.set_use_markup(True)
-        desc.set_ellipsize(pango.ELLIPSIZE_END)
-        desc.width = 0.6
-        self.add(desc)
-
-        # Last update
-        update = Label(0.0313, "title", 0.78, 0.1, _("Updated"))
-        self.add(update)
-        date_text = self.entry.time[:5]  + " - " +  self.entry.date
-        date = Label(0.0313, "subtitle", 0.78, 0.14, date_text)
-        self.add(date)
-
-        # Entry descrption
-        if len(self.entry.description.strip()) == 0:
-            entry_text = Label(0.04167, "text", 0.35, 0.48,
-                _("Entry has no content"))
-            self.add(entry_text)
-        else:
-            entry_text_data = FeedEntryParser().convert(self.entry.description)
-            entry_text = Label(0.0365, "text", 0, 0, entry_text_data)
-            entry_text.set_use_markup(True)
-            entry_text.set_size(0.5857, 0.5208)
-
-            self.scroll_area = ScrollArea(0.2072, 0.3, 0.5857, 0.4948,
-                entry_text)
-            self.add(self.scroll_area)
-
-        # Add the additional actions that are needed but not handled by default
-        self.event_handlers.update({
-            UserEvent.NAVIGATE_FIRST_PAGE : self._handle_first_page,
-            UserEvent.NAVIGATE_LAST_PAGE : self._handle_last_page,
-            UserEvent.NAVIGATE_PREVIOUS_PAGE : self._handle_previous_page,
-            UserEvent.NAVIGATE_NEXT_PAGE : self._handle_next_page
-        })
-
-        # We're at the end without any problems so lets set the entry as read.
-        self.entry.read = True
-
-    def _handle_up(self):
-        '''Handle UserEvent.NAVIGATE_UP.'''
-        self.scroll_area.scroll_up()
-
-    def _handle_down(self):
-        '''Handle UserEvent.NAVIGATE_DOWN.'''
-        self.scroll_area.scroll_down()
-
-    def _handle_first_page(self):
-        '''Handle UserEvent.NAVIGATE_FIRST_PAGE.'''
-        self.scroll_area.scroll_to_top()
-
-    def _handle_last_page(self):
-        '''Handle UserEvent.NAVIGATE_LAST_PAGE.'''
-        self.scroll_area.scroll_to_bottom()
-
-    def _handle_previous_page(self):
-        '''Handle UserEvent.NAVIGATE_PREVIOUS_PAGE.'''
-        self.scroll_area.scroll_page_up()
-
-    def _handle_next_page(self):
-        '''Handle UserEvent.NAVIGATE_NEXT_PAGE.'''
-        self.scroll_area.scroll_page_down()
-

=== modified file 'entertainerlib/gui/screens/main.py'
--- entertainerlib/gui/screens/main.py	2009-12-19 16:27:15 +0000
+++ entertainerlib/gui/screens/main.py	2010-04-03 15:04:16 +0000
@@ -8,8 +8,6 @@
 from entertainerlib.gui.widgets.label import Label
 from entertainerlib.gui.widgets.scroll_menu import ScrollMenu
 from entertainerlib.gui.widgets.texture import Texture
-from entertainerlib.gui.widgets.text_menu import TextMenu
-from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
 
 class Main(Screen):
     '''Screen displayed when frontend is opened and provides main navigation.'''
@@ -22,10 +20,9 @@
     UP = 0
     DOWN = 1
 
-    def __init__(self, feed_library, media_player, move_to_new_screen_callback):
+    def __init__(self, media_player, move_to_new_screen_callback):
         Screen.__init__(self, 'Main', move_to_new_screen_callback)
 
-        self.feed_library = feed_library
         self.media_player = media_player
         self.media_player.connect("stop", self.update)
         self.media_player.connect("play", self.update)
@@ -40,9 +37,6 @@
         self.preview.set_opacity(0x00)
         self.add(self.preview)
 
-        self.rss_preview_menu = self._create_rss_preview_menu()
-        self.preview.add(self.rss_preview_menu)
-
         self.menu = self._create_main_menu()
         self.add(self.menu)
 
@@ -52,7 +46,6 @@
 
         self.menu.connect('selected', self._handle_select)
         self.menu.connect('moved', self._on_menu_moved)
-        self.menu.connect('activated', self._on_menu_activated)
 
         self.menu.active = True
 
@@ -73,7 +66,6 @@
         menu.add_item(_("Videos"), "videos")
         menu.add_item(_("Music"), "music")
         menu.add_item(_("Photographs"), "photo")
-        menu.add_item(_("Headlines"), "rss")
 
         if self.config.display_weather_in_client:
             menu.add_item(_("Weather"), "weather")
@@ -91,25 +83,6 @@
 
         return menu
 
-    def _create_rss_preview_menu(self):
-        '''Create the RSS preview menu that will show feed highlights. An
-        uninitialized menu will be returned to prevent move errors if there
-        is nothing in the feed library.'''
-        menu = TextMenu(0.035, 0.12, 0.549, 0.078)
-
-        if self.feed_library.is_empty() is False:
-            parser = FeedEntryParser()
-            entries = self.feed_library.get_latest_entries(5)
-            entries_list = [[parser.strip_tags(entry[0].title + " - " + \
-                entry[1].title), entry[1].date, \
-                { 'feed' : entry[0], 'entry' : entry[1] }] for entry in entries]
-            menu.async_add(entries_list)
-
-        menu.connect('selected', self._handle_select)
-        menu.connect('activated', self._on_rss_menu_activated)
-
-        return menu
-
     def _create_playing_preview(self):
         '''Create the Now Playing preview sidebar.'''
         preview = clutter.Group()
@@ -170,36 +143,8 @@
                 'length': self.media_player.get_media_duration_string()}
             self._preview_title.set_text(title_text)
 
-    def _create_rss_preview(self):
-        '''Create the RSS preview sidebar.'''
-        preview = clutter.Group()
-
-        # RSS Icon
-        icon = Texture(self.theme.getImage("rss_icon"), 0, 0.04)
-        icon.set_scale(0.6, 0.6)
-        preview.add(icon)
-
-        # RSS Feed Title
-        title = Label(0.075, "title", 0.045, 0.03, _("Recent headlines"))
-        preview.add(title)
-
-        if self.feed_library.is_empty() is False:
-            menu = self._create_rss_preview_menu()
-            preview.add(menu)
-            self.rss_preview_menu = menu
-        else:
-            # No headlines available in the library
-            info = Label(0.05, "title", 0.1, 0.35, _("No headlines available"))
-            preview.add(info)
-            self.rss_preview_menu = None
-
-        return preview
-
     def _update_preview_area(self):
         '''Update the preview area to display the current menu item.'''
-        if self.rss_preview_menu:
-            rss_preview_menu_active = self.rss_preview_menu.active
-
         self.preview.remove_all()
         item = self.menu.get_selected()
 
@@ -209,10 +154,6 @@
 
         if item.get_name() == "playing":
             self.preview.add(self._create_playing_preview())
-        elif item.get_name() == "rss":
-            self.preview.add(self._create_rss_preview())
-            if self.rss_preview_menu:
-                self.rss_preview_menu.active = rss_preview_menu_active
         else:
             update = False
 
@@ -224,14 +165,6 @@
             self.behaviour.apply(self.preview)
             fade_in.start()
 
-    def _can_move_horizontally(self):
-        '''Return a boolean indicating if horizontal movement is allowed.'''
-        item = self.menu.get_selected()
-        if self.feed_library.is_empty() or item.get_name() != 'rss':
-            return False
-        else:
-            return True
-
     def update(self, event=None):
         """
         Update screen widgets. This is called always when screen is poped from
@@ -249,26 +182,11 @@
 
     def _handle_up(self):
         '''Handle UserEvent.NAVIGATE_UP.'''
-        if self.menu.active:
-            self.menu.scroll_up()
-        else:
-            self.rss_preview_menu.up()
+        self.menu.scroll_up()
 
     def _handle_down(self):
         '''Handle UserEvent.NAVIGATE_DOWN.'''
-        if self.menu.active:
-            self.menu.scroll_down()
-        else:
-            self.rss_preview_menu.down()
-
-    def _handle_left(self):
-        '''Handle UserEvent.NAVIGATE_LEFT.'''
-        if self._can_move_horizontally():
-            self.rss_preview_menu.active = True
-
-    def _handle_right(self):
-        '''Handle UserEvent.NAVIGATE_RIGHT.'''
-        self.menu.active = True
+        self.menu.scroll_down()
 
     def _handle_select(self, event=None):
         '''Handle UserEvent.NAVIGATE_SELECT.'''
@@ -286,24 +204,8 @@
             self.callback("weather")
         elif item.get_name() == "photo":
             self.callback("photo_albums")
-        elif item.get_name() == "rss":
-            if self.menu.active:
-                self.callback("rss")
-            else:
-                menu_item = self.rss_preview_menu.selected_item
-                kwargs = menu_item.userdata
-                self.callback("entry", kwargs)
 
     def _on_menu_moved(self, event):
         '''Update preview area when selected item changed on the menu.'''
         self._update_preview_area()
 
-    def _on_menu_activated(self, event=None):
-        '''Handle the main menu activation.'''
-        if self.rss_preview_menu is not None:
-            self.rss_preview_menu.active = False
-
-    def _on_rss_menu_activated(self, event=None):
-        '''Handle the rss menu activation.'''
-        self.menu.active = False
-

=== removed file 'entertainerlib/gui/screens/rss.py'
--- entertainerlib/gui/screens/rss.py	2009-07-29 03:09:34 +0000
+++ entertainerlib/gui/screens/rss.py	1970-01-01 00:00:00 +0000
@@ -1,228 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Rss - Screen displays RSS feeds'''
-
-import pango
-
-from entertainerlib.gui.screens.screen import Screen
-from entertainerlib.gui.widgets.label import Label
-from entertainerlib.gui.widgets.texture import Texture
-from entertainerlib.gui.widgets.text_menu import TextMenu
-from entertainerlib.gui.widgets.list_indicator import ListIndicator
-from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
-
-class Rss(Screen):
-    '''Screen displays RSS-feed titles and number of entries.'''
-
-    def __init__(self, feed_library, move_to_new_screen_callback):
-        Screen.__init__(self, 'Rss', move_to_new_screen_callback)
-
-        self.feed_order = 'UNREAD' # Feeds ordered by number of unread entries
-        self.theme = self.config.theme
-        self.library = feed_library
-        self.parser = FeedEntryParser()
-
-        # Screen Title (Displayed at the bottom left corner)
-        screen_title = Label(0.13, "screentitle", 0, 0.87, _("Headlines"))
-        self.add(screen_title)
-
-        # RSS Icon
-        icon = Texture(self.theme.getImage("rss_icon"), 0.05, 0.07)
-        self.add(icon)
-
-        # RSS Title
-        title = Label(0.0833, "title", 0.13, 0.07, _("RSS Feeds"))
-        self.add(title)
-
-        #We set the menus to None here so we can check if they exist later on
-        self.menu = None
-        self.context_menu = None
-
-        # Display information box if there are not feeds available
-        if self.library.is_empty() or len(self.library.get_feeds()) == 0:
-            self._create_no_feeds_information()
-        else:
-            # Menus
-            self._create_context_menu()
-            self.menu = self._create_feed_menu()
-            self.add(self.menu)
-            self.li = None
-            self._create_feed_menu_indicator()
-            self.menu.active = True
-            self.context_menu.active = False
-
-            # Feeds Title
-            feeds_title = Label(0.04167, "title", 0.3953, 0.2, _("Feeds"))
-            self.add(feeds_title)
-
-            # Unread Title
-            unread_title = Label(0.04167, "title", 0.8053, 0.2, _("Unread"))
-            self.add(unread_title)
-
-            # Feed description text
-            desc_text = self.parser.strip_tags(
-                self.menu.selected_userdata.description)
-
-            self.description = Label(0.03646, "text", 0.3953, 0.9, desc_text)
-            self.description.set_ellipsize(pango.ELLIPSIZE_END)
-            self.description.set_use_markup(True)
-            self.description.set_size(0.5088, 0.0651)
-            self.add(self.description)
-
-            self.menu.connect('selected', self._handle_select)
-            self.menu.connect('moved', self._display_selected_feed)
-            self.menu.connect('activated', self._menu_activation)
-            self.context_menu.connect('selected', self._handle_select)
-            self.context_menu.connect('activated',
-                self._context_menu_activation)
-
-    def _create_feed_menu(self):
-        """
-        Create Feed-menu. This menu contains list of Feeds. It also displays
-        number of unread entries per feed.
-        """
-        menu = TextMenu(0.3807, 0.2604, 0.5124, 0.0781)
-
-        feeds = self.library.get_feeds(self.feed_order)
-        feeds_list = [[self.parser.strip_tags(feed.title), \
-            str(feed.get_number_of_unread()), feed] \
-            for feed in feeds]
-        menu.async_add(feeds_list)
-
-        return menu
-
-    def _create_feed_menu_indicator(self):
-        '''Create a ListIndicator for feed menu.'''
-        self.li = ListIndicator(0.7, 0.9, 0.2, 0.045, ListIndicator.VERTICAL)
-        self.li.set_maximum(len(self.library.get_feeds(self.feed_order)))
-        self.add(self.li)
-
-    def _create_context_menu(self):
-        """
-        Create RSS-feed context menu and add it to the screen.
-        This menu contains buttons for update and sorting.
-        """
-        self.context_menu = TextMenu(0.0732, 0.2604, 0.2196, 0.0781)
-
-        self.context_menu.add_item(_("Update feeds"))
-        self.context_menu.add_item(_("Mark all as read"))
-        self.context_menu.add_item(_("Sort by name"))
-        self.context_menu.add_item(_("Sort by unread"))
-
-        self.context_menu.active = False
-        self.add(self.context_menu)
-
-    def _create_no_feeds_information(self):
-        """
-        Create textures and labels for information screen. This is displayed
-        instead of feeds list if there are no feeds available. This screen helps
-        users to add new feeds to the system.
-        """
-        # Create warning icon
-        warning_icon = Texture(self.theme.getImage("warning_icon"), 0.28, 0.27)
-        self.add(warning_icon)
-
-        # Create warning title
-        info_title = Label(0.0625, "title", 0.3367, 0.2709,
-            _("No headlines available!"))
-        self.add(info_title)
-
-        # Create warning help text
-        message = _(
-            "To use headlines you have to add some RSS feeds with the Content "
-            "management tool. To do this, start the Content management tool, "
-            "open the 'RSS Feeds' tab and click the 'Add' button. Now you can "
-            "write an RSS feed URL in the text entry. You can get RSS feed "
-            "URLs from webpages that support RSS.")
-        info = Label(0.0417, "menuitem_inactive", 0.2804, 0.45, message)
-        info.set_size(0.5, 0.5208)
-        self.add(info)
-
-    def update(self, event=None):
-        """
-        Update screen widgets. This is called always when screen is poped from
-        the screen history.
-        """
-        feeds = self.library.get_feeds(self.feed_order)
-        for idx, item in enumerate(self.menu.items):
-            feed = feeds[idx]
-            item.userdata = feed
-            item.update(self.parser.strip_tags(feed.title),
-                str(feed.get_number_of_unread()))
-
-    def _handle_up(self):
-        '''Handle UserEvent.NAVIGATE_UP.'''
-        if self.menu.active:
-            self.menu.up()
-        else:
-            self.context_menu.up()
-
-    def _handle_down(self):
-        '''Handle UserEvent.NAVIGATE_DOWN.'''
-        if self.menu.active:
-            self.menu.down()
-        else:
-            self.context_menu.down()
-
-    def _handle_left(self):
-        '''Handle UserEvent.NAVIGATE_LEFT.'''
-        if self.menu.active:
-            self._context_menu_activation()
-
-    def _handle_right(self):
-        '''Handle UserEvent.NAVIGATE_RIGHT.'''
-        if not self.menu.active:
-            self._menu_activation()
-
-    def _handle_select(self, event=None):
-        '''Handle UserEvent.NAVIGATE_SELECT.'''
-        if not self.menu.active:
-            index = self.context_menu.selected_index
-            if index == 0:
-                # Send message to bus and update screen
-                self.library.request_feed_update()
-                self.update()
-            elif index == 1:
-                # Tell feedlibrary to mark all as read and then update screen
-                self.library.mark_all_as_read()
-                self.update()
-            elif index == 2:
-                # Sort feeds by title ASC and update screen
-                self.feed_order = 'TITLE'
-                self.update()
-            elif index == 3:
-                # Sort feeds by UNREAD DESC and update screen
-                self.feed_order = 'UNREAD'
-                self.update()
-        else:
-            # Feed selected from the menu. Change screen.
-            feed = self.menu.selected_userdata
-            kwargs = { 'feed' : feed }
-            self.callback("feed", kwargs)
-
-    def handle_user_event(self, event=None):
-        '''Handle screen specific user events unless the library is empty.'''
-        if self.library.is_empty() or len(self.library.get_feeds()) == 0:
-            return
-        else:
-            Screen.handle_user_event(self, event)
-
-    def _display_selected_feed(self, actor=None):
-        '''Update of the list indicator and the description label'''
-        self.li.set_current(self.menu.selected_index + 1)
-        feed = self.menu.selected_userdata
-        self.description.set_text(self.parser.strip_tags(feed.description))
-
-    def _menu_activation(self, actor=None):
-        '''Handle the menu activation'''
-        self.menu.active = True
-        self.context_menu.active = False
-        self.li.show_position()
-        self.description.show()
-
-    def _context_menu_activation(self, actor=None):
-        '''Handle the context menu activation'''
-        self.menu.active = False
-        self.context_menu.active = True
-        self.li.hide_position()
-        self.description.hide()
-

=== modified file 'entertainerlib/gui/user_interface.py'
--- entertainerlib/gui/user_interface.py	2009-12-22 02:44:49 +0000
+++ entertainerlib/gui/user_interface.py	2010-04-03 15:04:16 +0000
@@ -12,6 +12,8 @@
 import gobject
 import gtk
 
+from entertainerlib.client.media_player import MediaPlayer
+from entertainerlib.configuration import Configuration
 from entertainerlib.gui.widgets.volume_indicator import VolumeIndicator
 from entertainerlib.gui.screen_history import ScreenHistory
 from entertainerlib.gui.screens.factory import ScreenFactory
@@ -20,16 +22,14 @@
 from entertainerlib.gui.transitions.transition import Transition
 from entertainerlib.gui.user_event import UserEvent
 from entertainerlib.gui.widgets.menu_overlay import MenuOverlay
-from entertainerlib.client.media_player import MediaPlayer
-from entertainerlib.configuration import Configuration
 from entertainerlib.logger import Logger
 
 
 class UserInterface:
     '''A main GUI window of the Entertainer client.'''
 
-    def __init__(self, feed_library, image_library, music_library,
-        video_library, quit_client_callback):
+    def __init__(self, image_library, music_library, video_library,
+        quit_client_callback):
         self.quit_client_callback = quit_client_callback
         self.config = Configuration()
 
@@ -111,8 +111,8 @@
 
         # Screen factory to create new screens
         self.screen_factory = ScreenFactory(
-            feed_library, image_library, music_library, video_library,
-            self.player, self.move_to_new_screen, self.move_to_previous_screen)
+            image_library, music_library, video_library, self.player,
+            self.move_to_new_screen, self.move_to_previous_screen)
 
         def default_key_to_user_event():
             '''Return the default user event provided by an unmapped keyboard

=== modified file 'entertainerlib/indexing/handlers.py'
--- entertainerlib/indexing/handlers.py	2009-07-12 17:31:52 +0000
+++ entertainerlib/indexing/handlers.py	2010-04-03 15:04:16 +0000
@@ -32,16 +32,16 @@
 
     def _add_file(self, filename):
         '''Add a video.'''
-        file = models.VideoFile()
-        file.filename = unicode(filename)
+        video_file = models.VideoFile()
+        video_file.filename = unicode(filename)
         thumbnailer = VideoThumbnailer(filename)
         thumbnailer.create_thumbnail()
-        file.thumbnail = thumbnailer.filename
+        video_file.thumbnail = thumbnailer.filename
 
-        self._store.add(file)
+        self._store.add(video_file)
         self._store.commit()
 
-        return file
+        return video_file
 
     def _update_file(self, filename):
         '''Update on existing video.'''
@@ -63,17 +63,17 @@
 
     def _add_file(self, filename):
         '''Add an image to the store.'''
-        file = models.PhotoImage()
-        file.filename = unicode(filename)
+        photo_file = models.PhotoImage()
+        photo_file.filename = unicode(filename)
 
         thumbnailer = ImageThumbnailer(filename)
         thumbnailer.create_thumbnail()
-        file.thumbnail = unicode(thumbnailer.filename)
+        photo_file.thumbnail = unicode(thumbnailer.filename)
 
-        self._store.add(file)
+        self._store.add(photo_file)
         self._store.commit()
 
-        return file
+        return photo_file
 
     def _update_file(self, filename):
         '''Update an existing image in the store.'''
@@ -95,50 +95,50 @@
 
     def _add_file(self, filename):
         '''Add a file to the store.'''
-        file = models.MusicTrack()
+        music_file = models.MusicTrack()
         album = models.MusicAlbum()
 
-        file.filename = filename
+        music_file.filename = filename
 
         tags = TagGetter(filename)
 
-        file.comment = tags.comment
-        file.lyrics = u''
-        file.title = tags.title
-        file.tracknumber = tags.track_number
+        music_file.comment = tags.comment
+        music_file.lyrics = u''
+        music_file.title = tags.title
+        music_file.tracknumber = tags.track_number
         album.artist = tags.artist
         album.title = tags.album
         album.genre = tags.genre
-        file.album = album
+        music_file.album = album
 
         self._store.add(album)
-        self._store.add(file)
+        self._store.add(music_file)
         self._store.commit()
 
         # TODO: get album art
-        return file
+        return music_file
 
     def _update_file(self, filename):
         '''Update a file already in the store.'''
-        file = self._store.find(models.MusicTrack,
+        music_file = self._store.find(models.MusicTrack,
             models.MusicTrack.filename == filename).one()
-        album = file.album
+        album = music_file.album
 
         tags = TagGetter(filename)
 
-        file.comment = tags.comment
-        file.lyrics = u''
-        file.title = tags.title
-        file.tracknumber = tags.track_number
+        music_file.comment = tags.comment
+        music_file.lyrics = u''
+        music_file.title = tags.title
+        music_file.tracknumber = tags.track_number
         album.artist = tags.artist
         album.title = tags.album
         album.genre = tags.genre
-        file.album = album
+        music_file.album = album
 
         self._store.add(album)
-        self._store.add(file)
+        self._store.add(music_file)
         self._store.commit()
 
         # TODO: get album art
-        return file
+        return music_file
 

=== modified file 'entertainerlib/indexing/indexer.py'
--- entertainerlib/indexing/indexer.py	2009-07-12 17:31:52 +0000
+++ entertainerlib/indexing/indexer.py	2010-04-03 15:04:16 +0000
@@ -1,4 +1,7 @@
 '''Indexer module.'''
+
+# Pylint thinks that handlers isn't being used when it clearly is. Ignore it.
+# pylint: disable-msg=W0611
 from entertainerlib.indexing import handlers
 from entertainerlib.configuration import Configuration
 from entertainerlib.logger import Logger

=== modified file 'entertainerlib/network/local/client.py'
--- entertainerlib/network/local/client.py	2009-04-04 05:30:04 +0000
+++ entertainerlib/network/local/client.py	2010-04-03 15:04:16 +0000
@@ -1,10 +1,10 @@
 '''Classes to produce a local storage implementation.'''
 # pylint: disable-msg=W0223
 
-from twisted.internet.defer import inlineCallbacks
+#from twisted.internet.defer import inlineCallbacks
 from twisted.protocols import amp
 
-from entertainerlib.network.local.commands import TenMusicTracks
+#from entertainerlib.network.local.commands import TenMusicTracks
 from entertainerlib.network.storage import Storage
 
 
@@ -15,11 +15,11 @@
         '''See `twisted.protocols.Protocal.connectionMade`.'''
         self.get_ten_tracks(1)
 
-    @inlineCallbacks
-    def get_ten_tracks(self, index):
-        '''Get ten tracks starting with the given index.'''
-        result = yield self.callRemote(TenMusicTracks, index=index)
-        print result
+#    @inlineCallbacks
+#    def get_ten_tracks(self, index):
+#        '''Get ten tracks starting with the given index.'''
+#        result = yield self.callRemote(TenMusicTracks, index=index)
+#        print result
 
 
 class LocalStorage(Storage):

=== removed directory 'entertainerlib/tests/data/FeedConfigTools'
=== removed file 'entertainerlib/tests/data/FeedConfigTools/test.opml'
--- entertainerlib/tests/data/FeedConfigTools/test.opml	2008-08-02 03:18:53 +0000
+++ entertainerlib/tests/data/FeedConfigTools/test.opml	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<opml version="1.0">
-  <head>
-    <title>Liferea Feed List Export</title>
-  </head>
-  <body>
-    <outline title="Tech" text="Tech" description="Tech" type="folder">
-      <outline title="Hack a Day" text="Hack a Day" description="Hack a Day" type="rss" htmlUrl="http://www.hackaday.com" xmlUrl="http://www.hackaday.com/rss.xml"/>
-      <outline title="OSS" text="OSS" description="OSS" type="folder">
-        <outline title="Linux" text="Linux" description="Linux" type="folder">
-          <outline title="edevelop.org - Pants ON" text="edevelop.org - Pants ON" description="edevelop.org - Pants ON" type="rss" htmlUrl="http://edevelop.org" xmlUrl="http://edevelop.org/planet/rss20.xml"/>
-        </outline>
-      </outline>
-      <outline title="3D CG" text="3D CG" description="3D CG" type="folder">
-        <outline title="BlenderArt Magazine: The unofficial Blender 3D magazine" text="BlenderArt Magazine: The unofficial Blender 3D magazine" description="BlenderArt Magazine: The unofficial Blender 3D magazine" type="rss" htmlUrl="http://www.blenderart.org" xmlUrl="http://feeds.feedburner.com/BlenderartMagazine"/>
-      </outline>
-    </outline>
-  </body>
-</opml>

=== removed directory 'entertainerlib/tests/data/OPMLParser'
=== removed directory 'entertainerlib/tests/data/OPMLParser/lifereaMultiple'
=== removed directory 'entertainerlib/tests/data/OPMLParser/lifereaMultiple/.liferea_1.4'
=== removed file 'entertainerlib/tests/data/OPMLParser/lifereaMultiple/.liferea_1.4/feedlist.opml'
--- entertainerlib/tests/data/OPMLParser/lifereaMultiple/.liferea_1.4/feedlist.opml	2008-02-08 16:37:34 +0000
+++ entertainerlib/tests/data/OPMLParser/lifereaMultiple/.liferea_1.4/feedlist.opml	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-test

=== removed directory 'entertainerlib/tests/data/OPMLParser/lifereaNoFile'
=== removed directory 'entertainerlib/tests/data/OPMLParser/lifereaNoFolder'
=== removed directory 'entertainerlib/tests/data/OPMLParser/lifereaSingle'
=== removed directory 'entertainerlib/tests/data/OPMLParser/lifereaSingle/.liferea'
=== removed file 'entertainerlib/tests/data/OPMLParser/lifereaSingle/.liferea/feedlist.opml'
--- entertainerlib/tests/data/OPMLParser/lifereaSingle/.liferea/feedlist.opml	2008-02-08 16:37:34 +0000
+++ entertainerlib/tests/data/OPMLParser/lifereaSingle/.liferea/feedlist.opml	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-test

=== removed file 'entertainerlib/tests/data/OPMLParser/noXML.txt'
--- entertainerlib/tests/data/OPMLParser/noXML.txt	2008-02-08 16:37:34 +0000
+++ entertainerlib/tests/data/OPMLParser/noXML.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-This is not an xml file

=== removed file 'entertainerlib/tests/data/OPMLParser/opmlInOpml.opml'
--- entertainerlib/tests/data/OPMLParser/opmlInOpml.opml	2008-02-08 16:37:34 +0000
+++ entertainerlib/tests/data/OPMLParser/opmlInOpml.opml	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<opml version="1.0">
-  <head>
-    <title>Liferea Feed List Export</title>
-  </head>
-  <body>
-    <outline title="BBC News | News Front Page | UK Edition" text="BBC News | News Front Page | UK Edition" description="BBC News | News Front Page | UK Edition" type="rss" htmlUrl="http://news.bbc.co.uk/go/rss/-/1/hi/default.stm" xmlUrl="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/front_page/rss.xml"/>
-    <outline title="BBC News | News Front Page | UK Edition" text="BBC News | News Front Page | UK Edition" description="BBC News | News Front Page | UK Edition" type="rss" htmlUrl="http://news.bbc.co.uk/go/rss/-/1/hi/default.stm" xmlUrl="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/front_page/rss.opml"/>
-    <outline title="Tech" text="Tech" description="Tech" type="folder">
-      <outline title="Hack a Day" text="Hack a Day" description="Hack a Day" type="rss" htmlUrl="http://www.hackaday.com" xmlUrl="http://www.hackaday.com/rss.xml"/>
-      <outline title="OSS" text="OSS" description="OSS" type="folder">
-        <outline title="Linux" text="Linux" description="Linux" type="folder">
-          <outline title="edevelop.org - Pants ON" text="edevelop.org - Pants ON" description="edevelop.org - Pants ON" type="rss" htmlUrl="http://edevelop.org" xmlUrl="http://edevelop.org/planet/rss20.xml"/>
-        </outline>
-      </outline>
-      <outline title="3D CG" text="3D CG" description="3D CG" type="folder">
-        <outline title="BlenderArt Magazine: The unofficial Blender 3D magazine" text="BlenderArt Magazine: The unofficial Blender 3D magazine" description="BlenderArt Magazine: The unofficial Blender 3D magazine" type="rss" htmlUrl="http://www.blenderart.org" xmlUrl="http://feeds.feedburner.com/BlenderartMagazine"/>
-      </outline>
-    </outline>
-  </body>
-</opml>

=== removed file 'entertainerlib/tests/data/OPMLParser/test.opml'
--- entertainerlib/tests/data/OPMLParser/test.opml	2008-02-08 16:37:34 +0000
+++ entertainerlib/tests/data/OPMLParser/test.opml	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<opml version="1.0">
-  <head>
-    <title>Liferea Feed List Export</title>
-  </head>
-  <body>
-    <outline title="BBC News | News Front Page | UK Edition" text="BBC News | News Front Page | UK Edition" description="BBC News | News Front Page | UK Edition" type="rss" htmlUrl="http://news.bbc.co.uk/go/rss/-/1/hi/default.stm" xmlUrl="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/front_page/rss.xml"/>
-    <outline title="Tech" text="Tech" description="Tech" type="folder">
-      <outline title="Hack a Day" text="Hack a Day" description="Hack a Day" type="rss" htmlUrl="http://www.hackaday.com" xmlUrl="http://www.hackaday.com/rss.xml"/>
-      <outline title="OSS" text="OSS" description="OSS" type="folder">
-        <outline title="Linux" text="Linux" description="Linux" type="folder">
-          <outline title="edevelop.org - Pants ON" text="edevelop.org - Pants ON" description="edevelop.org - Pants ON" type="rss" htmlUrl="http://edevelop.org" xmlUrl="http://edevelop.org/planet/rss20.xml"/>
-        </outline>
-      </outline>
-      <outline title="3D CG" text="3D CG" description="3D CG" type="folder">
-        <outline title="BlenderArt Magazine: The unofficial Blender 3D magazine" text="BlenderArt Magazine: The unofficial Blender 3D magazine" description="BlenderArt Magazine: The unofficial Blender 3D magazine" type="rss" htmlUrl="http://www.blenderart.org" xmlUrl="http://feeds.feedburner.com/BlenderartMagazine"/>
-      </outline>
-    </outline>
-  </body>
-</opml>

=== modified file 'entertainerlib/tests/mock.py'
--- entertainerlib/tests/mock.py	2010-01-03 22:58:00 +0000
+++ entertainerlib/tests/mock.py	2010-04-03 15:04:16 +0000
@@ -6,30 +6,13 @@
 
 import gobject
 
-from entertainerlib.client.medialibrary.feeds import Entry, Feed, FeedLibrary
 from entertainerlib.client.medialibrary.images import Image, ImageLibrary
-from entertainerlib.client.medialibrary.music import Album, MusicLibrary, Track
+from entertainerlib.client.medialibrary.music import MusicLibrary
 from entertainerlib.client.medialibrary.videos import (Movie, TVEpisode,
     TVSeries, VideoLibrary)
 
 THIS_DIR = os.path.dirname(__file__)
 
-class MockAlbum(Album):
-    '''Mock entertainerlib.client.medialibrary.music.Album'''
-
-    def __init__(self, title=None, cursor=None, make_track=True):
-        self.title = 'Ganging Up on the Sun'
-        self.total_length = 120
-        if make_track:
-            self.mock_track = MockTrack(make_album=False)
-
-        self.tracks = [self.mock_track]
-
-    def has_album_art(self):
-        '''See `Album.has_album_art`.'''
-        return False
-
-
 class MockClutterKeyboardEvent(object):
     '''Mock clutter keyboard events'''
 
@@ -43,50 +26,6 @@
         return self._keyval
 
 
-class MockEntry(Entry):
-    '''Mock entertainerlib.client.medialibrary.feeds.Entry'''
-
-    def __init__(self, title=None, description=None, identifier=None,
-        time=None, date=None, read=False):
-        self.date = 'January 31st'
-        self.description = "What!? I have to describe this thing?"
-        self.time = 'Too early'
-        self.title = 'Fake Entry'
-        self._read = read
-
-    def _get_read(self):
-        '''Get the read property.'''
-        return self._read
-
-    def _set_read(self, read):
-        '''Set the read property. Used to prevent a connection to the db.'''
-        self._read = read
-
-    read = property(_get_read, _set_read)
-
-
-class MockFeed(Feed):
-    '''Mock entertainerlib.client.medialibrary.feeds.Feed'''
-
-    def __init__(self, url=None):
-        self.date = 'January 31st'
-        self.subtitle = 'Whoa, a subtitle.'
-        self.time = 'Too early'
-        self.title = 'Fake Feed'
-        self.entries = []
-
-
-class MockFeedLibrary(FeedLibrary):
-    '''Mock entertainerlib.client.medialibrary.feeds.FeedLibrary'''
-
-    def __init__(self, backend_connection=None):
-        '''Override the intial behavior.'''
-
-    def is_empty(self):
-        '''See `FeedLibrary.is_empty`.'''
-        return True
-
-
 class MockImage(Image):
     '''Mock entertainerlib.client.medialibrary.images.Image'''
 
@@ -260,21 +199,6 @@
         '''See `TVSeries.has_cover_art`.'''
         return False
 
-class MockTrack(Track):
-    '''Mock entertainerlib.client.medialibrary.music.Track'''
-
-    def __init__(self, filename=None, title=None, tracknumber=None, artist=None,
-        album=None, genre=None, bitrate=None, year=None, rating=None,
-        length=None, comment=None, lyrics=None, make_album=True):
-        self.artist = 'Guster'
-        self.length = 60
-        self.lyrics = 'Here are some lyrics'
-        self.title = 'One Man Wrecking Machine'
-        self.tracknumber = 0
-        if make_album:
-            self.album = MockAlbum(make_track=False)
-
-
 class MockVideoLibrary(VideoLibrary):
     '''Mock entertainerlib.client.medialibrary.videos.VideoLibrary'''
 

=== modified file 'entertainerlib/tests/test_configuration.py'
--- entertainerlib/tests/test_configuration.py	2009-08-27 03:18:41 +0000
+++ entertainerlib/tests/test_configuration.py	2010-04-03 15:04:16 +0000
@@ -24,14 +24,8 @@
         self.assertEqual(self.configuration.theme_path,
             os.path.join(self.test_cfg_dir, 'data', 'themes', 'Default'))
         self.assertFalse(self.configuration.tray_icon_enabled)
-        self.assertEqual(self.configuration.feed_fetch_interval, 15)
         self.assertEqual(self.configuration.port, 45054)
         self.assertEqual(self.configuration.media_folders, [''])
-        self.assertEqual(self.configuration.feeds, [
-            'http://theironlion.net/blog/feed',
-            'http://www.joshuascotton.com/main/archives/tag/entertainer/feed',
-            'http://laymanstermsdev.wordpress.com/feed'
-        ])
         self.assertEqual(self.configuration.weather_location, 'Bath,England')
         self.assertTrue(self.configuration.display_weather_in_client)
         self.assertTrue(self.configuration.download_metadata)

=== removed file 'entertainerlib/tests/test_feedconfigtools.py'
--- entertainerlib/tests/test_feedconfigtools.py	2009-11-11 10:12:34 +0000
+++ entertainerlib/tests/test_feedconfigtools.py	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Test FeedConfigTools'''
-
-import os
-
-import gtk
-
-from entertainerlib.backend.components.feeds.feed_utils import FeedConfigTools
-from entertainerlib.tests import EntertainerTest
-
-THIS_DIR = os.path.dirname(__file__)
-
-
-class FeedConfigToolsTest(EntertainerTest):
-    # pylint: disable-msg=C0301
-    # This pylint warning can be removed when the backend stuff gets removed,
-    # and the pieces we keep get rearranged.
-    '''Test for entertainerlib.backend.components.feeds.feed_utils.FeedConfigTools'''
-
-    def setUp(self):
-        """Sets up everything for the test"""
-        EntertainerTest.setUp(self)
-
-        #setup feeds and model
-        self.feeds = self.config.feeds
-        self.model = gtk.ListStore(str)
-        for i in range(len(self.feeds)):
-            self.model.insert(i, [self.feeds[i]])
-
-        self.files = [THIS_DIR + "/data/FeedConfigTools/test.opml"]
-
-        self.feedList = [
-            u'http://www.hackaday.com/rss.xml',
-            u'http://edevelop.org/planet/rss20.xml',
-            u'http://feeds.feedburner.com/BlenderartMagazine'
-            ]
-
-        self.result_feed_list = self.feeds + self.feedList
-
-        self.feed_config_tools = FeedConfigTools()
-
-    def tearDown(self):
-        """restores config to how it should be to start off"""
-        EntertainerTest.tearDown(self)
-
-    def testAddFileFeedsToWidget001(self):
-        """Tests if self.feeds is updated correctly"""
-        self.feed_config_tools.add_file_feeds_to_widget(
-            self.files, self.model, self.feeds, False)
-        self.assertEqual(self.feeds, self.result_feed_list)
-
-    def testAddFileFeedsToWidget002(self):
-        """Tests if self.config is updated correctly"""
-        self.feed_config_tools.add_file_feeds_to_widget(
-            self.files, self.model, self.feeds, False)
-        self.assertEqual(self.config.feeds, self.result_feed_list)
-
-    def testAddFeedsToWidget001(self):
-        """Tests if self.feeds is updated correctly"""
-        self.feed_config_tools.add_feeds_to_widget(
-            self.feedList, self.model, self.feeds)
-        self.assertEqual(self.feeds, self.result_feed_list)
-
-    def testAddFeedsToWidget002(self):
-        """Tests if self.config is updated correctly"""
-        self.feed_config_tools.add_feeds_to_widget(
-            self.feedList, self.model, self.feeds)
-        self.assertEqual(self.config.feeds, self.result_feed_list)
-

=== removed file 'entertainerlib/tests/test_feedentryparser.py'
--- entertainerlib/tests/test_feedentryparser.py	2009-05-10 17:36:49 +0000
+++ entertainerlib/tests/test_feedentryparser.py	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Test feed entry parser'''
-# pylint: disable-msg=C0301
-
-from entertainerlib.tests import EntertainerTest
-from entertainerlib.backend.components.feeds.feed_utils import FeedEntryParser
-
-
-class FeedEntryParserTest(EntertainerTest):
-    '''Test the FeedEntryParser'''
-
-    def setUp(self):
-        """Sets up everything for the test"""
-        EntertainerTest.setUp(self)
-
-        #test strings
-        self.testString001 = "<body><b>Hello World</body></b>"
-        self.testString002 = "<body><span id=\"001\"><u><b>&nbsp;He<i>l</i>lo <big>World</b></big><s>!</s><sub>!</sub><div><sup>!</sup><small>!</small><tt></div>...</tt></u></span></body>"
-        self.resultString001 = "Hello World"
-        self.resultString002 = "<span id=\"001\"><u><b>&nbsp;He<i>l</i>lo <big>World</b></big><s>!</s><sub>!</sub><sup>!</sup><small>!</small><tt>...</tt></u></span>"
-        self.resultString003 = "<body>Hello World</body>"
-        self.resultString004 = "<span id=\"001\"><u><b> He<i>l</i>lo <big>World</b></big><s>!</s><sub>!</sub><sup>!</sup><small>!</small><tt>...</tt></u></span>"
-
-    def testStripTags001(self):
-        """tests if FeedEntryParser strips all tags from input using default
-        tags
-        """
-        output = FeedEntryParser().strip_tags(self.testString001)
-        self.assertEqual(output, self.resultString001)
-
-    def testStripTags002(self):
-        """tests if FeedEntryParser strips all tags from input using
-        non-default tags
-        """
-        output = FeedEntryParser().strip_tags(self.testString001, ["body"])
-        self.assertEqual(output, self.resultString003)
-
-    def testStripNonPangoTags(self):
-        """testStripNonPangoTags: tests if FeedEntryParser strips all
-        non-pango tags from input
-        """
-        output = FeedEntryParser().strip_non_pango_tags(self.testString002)
-        self.assertEqual(output, self.resultString002)
-
-    def testConvert(self):
-        """tests if FeedEntryParser converts input to correct output"""
-        output = FeedEntryParser().convert(self.testString002)
-        self.assertEqual(output, self.resultString004)
-

=== modified file 'entertainerlib/tests/test_filehandlers.py'
--- entertainerlib/tests/test_filehandlers.py	2009-07-12 17:31:52 +0000
+++ entertainerlib/tests/test_filehandlers.py	2010-04-03 15:04:16 +0000
@@ -1,4 +1,5 @@
 '''Tests for entertainerlib.indexing.handlers.'''
+# pylint: disable-msg=W0212
 import os
 
 from storm.locals import Store

=== removed file 'entertainerlib/tests/test_frontendfeed.py'
--- entertainerlib/tests/test_frontendfeed.py	2009-07-29 03:09:34 +0000
+++ entertainerlib/tests/test_frontendfeed.py	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Tests feeds from the client'''
-
-from pysqlite2 import dbapi2 as sqlite
-
-from entertainerlib.client.medialibrary.feeds import Feed
-from entertainerlib.tests import EntertainerTest
-
-class FrontendFeedTest(EntertainerTest):
-    '''Test reading feeds from the client'''
-
-    def setUp(self):
-        EntertainerTest.setUp(self)
-
-        db_conn = sqlite.connect(self.config.FEED_DB)
-        db_cursor = db_conn.cursor()
-        db_cursor.execute("""DROP TABLE IF EXISTS feed""")
-        db_cursor.execute("""DROP TABLE IF EXISTS entry""")
-        db_cursor.execute(
-            """CREATE TABLE feed(url TEXT, title TEXT, subtitle TEXT,
-            description TEXT, time TIME, date DATE, PRIMARY KEY(url))""")
-        db_cursor.execute(
-            """CREATE TABLE entry(feed_url TEXT, title TEXT, description TEXT,
-            isread TEXT, time TIME, date DATE, id TEXT, PRIMARY KEY(id))""")
-        db_conn.commit()
-
-        for i in range(10):
-            feed_row = ("url"+str(i), "title"+str(i), "subtitle"+str(i),
-                "description"+str(i), "2008-01-01", "12:00:00")
-            db_cursor.execute(
-                """INSERT INTO feed(url,title,subtitle,description,date,time)
-                VALUES (?,?,?,?,?,?)""", feed_row)
-            db_conn.commit()
-
-        for i in range(9):
-            if i % 2 == 0:
-                read = "NO"
-            else:
-                read = "YES"
-            entry_row = ("url1", "entry"+str(i), "desc", read, str(i),
-                "2008-01-01", "12:00:00")
-            db_cursor.execute(
-                """INSERT INTO entry(feed_url,title,description,isread,id,date,
-                time) VALUES (?,?,?,?,?,?,?)""", entry_row)
-            db_conn.commit()
-        db_conn.close()
-
-        self.feed = Feed("url1")
-
-    def tearDown(self):
-        EntertainerTest.tearDown(self)
-
-        db_conn = sqlite.connect(self.config.FEED_DB)
-        db_cursor = db_conn.cursor()
-        db_cursor.execute("""DROP TABLE IF EXISTS feed""")
-        db_cursor.execute("""DROP TABLE IF EXISTS entry""")
-        db_conn.commit()
-        db_conn.close()
-
-    def test_title(self):
-        '''Test that title contains the correct value.'''
-        self.assertEqual("title1", self.feed.title)
-
-    def test_description(self):
-        '''Test that description contains the correct value.'''
-        self.assertEqual("description1", self.feed.description)
-
-    def test_entries(self):
-        '''Test that the entries are returned by testing the count.'''
-        self.assertEqual(9, len(self.feed.entries))
-
-    def test_get_entry(self):
-        '''Entry of the given identifier is properly returned.'''
-        self.assertEqual("entry3", self.feed.get_entry("3").title)
-
-    def test_get_number_of_unread(self):
-        '''Test the number of unread entries is returned.'''
-        self.assertEqual(5, self.feed.get_number_of_unread())
-
-    def test_subtitle(self):
-        '''Test that subtitle contains the correct value.'''
-        self.assertEqual("subtitle1", self.feed.subtitle)
-
-    def test_url(self):
-        '''Test that url contains the correct value.'''
-        self.assertEqual("url1", self.feed.url)
-
-    def test_time(self):
-        '''Test that time contains the correct value.'''
-        self.assertEqual("12:00:00", self.feed.time)
-
-    def test_date(self):
-        '''Test that date contains the correct value.'''
-        self.assertEqual("2008-01-01", self.feed.date)
-

=== removed file 'entertainerlib/tests/test_frontendfeedentry.py'
--- entertainerlib/tests/test_frontendfeedentry.py	2009-06-30 01:06:01 +0000
+++ entertainerlib/tests/test_frontendfeedentry.py	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Tests feed entries on the client'''
-# pylint: disable-msg=W0212
-
-from pysqlite2 import dbapi2 as sqlite
-
-from entertainerlib.client.medialibrary.feeds import Feed, Entry
-from entertainerlib.tests import EntertainerTest
-
-class FrontendFeedEntryTest(EntertainerTest):
-    '''Tests feed entries on the client'''
-
-    entry_title = "Test Entry"
-    entry_desc = "This is a test description"
-    entry_id = "1"
-    entry_time = "13:02"
-    entry_date = "02/02/08"
-
-    def setUp(self):
-        EntertainerTest.setUp(self)
-
-        db_conn = sqlite.connect(self.config.FEED_DB)
-        db_cursor = db_conn.cursor()
-        db_cursor.execute(
-            """CREATE TABLE feed(url TEXT, title TEXT, subtitle TEXT,
-            description TEXT, time TIME, date DATE, PRIMARY KEY(url))""")
-        db_cursor.execute(
-            """CREATE TABLE entry(feed_url TEXT, title TEXT, description TEXT,
-            isread TEXT, time TIME, date DATE, id TEXT, PRIMARY KEY(id))""")
-        db_conn.commit()
-        entry_row = ("url2", "entry1", "desc", "NO", "1", "2008-01-01",
-            "12:00:00")
-        db_cursor.execute("""INSERT INTO entry(
-            feed_url, title, description, isread, id, date, time)
-            VALUES (?,?,?,?,?,?,?)""", entry_row)
-
-        db_conn.commit()
-        feed_row = ("url2", "title2", "subtitle2", "description2", "2008-01-01",
-            "12:00:00")
-        db_cursor.execute(
-            """INSERT INTO feed(url, title, subtitle, description, date, time)
-            VALUES (?,?,?,?,?,?)""", feed_row)
-        db_conn.commit()
-        db_conn.close()
-
-        self.entry = Entry(self.entry_title, self.entry_desc, self.entry_id,
-            self.entry_time, self.entry_date, False)
-
-    def tearDown(self):
-        EntertainerTest.tearDown(self)
-
-        db_conn = sqlite.connect(self.config.FEED_DB)
-        db_cursor = db_conn.cursor()
-        db_cursor.execute("""DROP TABLE IF EXISTS feed""")
-        db_cursor.execute("""DROP TABLE IF EXISTS entry""")
-        db_conn.commit()
-        db_conn.close()
-
-    def test_init_read_entry(self):
-        '''Test if Entry can handle the additional read parameter.'''
-        new_entry = Entry(self.entry_title, self.entry_desc, self.entry_id,
-            self.entry_time, self.entry_date, True)
-        self.assertTrue(new_entry.read)
-
-    def test_title(self):
-        '''Test the title property.'''
-        self.assertEqual(self.entry_title, self.entry.title)
-
-    def test_description(self):
-        '''Test the description property.'''
-        self.assertEqual(self.entry_desc, self.entry.description)
-
-    def test_identifier(self):
-        '''Test the identifier property.'''
-        self.assertEqual(self.entry_id, self.entry.identifier)
-
-    def test_time(self):
-        '''Test the time property.'''
-        self.assertEqual(self.entry_time, self.entry.time)
-
-    def test_date(self):
-        '''Test the date property.'''
-        self.assertEqual(self.entry_date, self.entry.date)
-
-    def test_read(self):
-        '''Test the read property and check the if the database updated.'''
-        self.assertFalse(self.entry.read)
-        feed = Feed("url2")
-        self.entry._set_read(True)
-        self.assertTrue(self.entry.read)
-        self.assertEqual(feed.get_number_of_unread(), 0)
-

=== removed file 'entertainerlib/tests/test_frontendfeedlibrary.py'
--- entertainerlib/tests/test_frontendfeedlibrary.py	2009-09-08 02:40:16 +0000
+++ entertainerlib/tests/test_frontendfeedlibrary.py	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Tests feed library from the client'''
-
-from pysqlite2 import dbapi2 as sqlite
-
-from entertainerlib.client.medialibrary.feeds import FeedLibrary
-from entertainerlib.tests import EntertainerTest
-
-class FrontendFeedLibraryTest(EntertainerTest):
-    """
-    Tests the client.medialibrary.feeds.FeedLibrary object
-    @todo comment tests
-    @todo the test database doesn't seem to be working
-    """
-
-    def setUp(self):
-        EntertainerTest.setUp(self)
-
-        db_conn = sqlite.connect(self.config.FEED_DB)
-        db_cursor = db_conn.cursor()
-        db_cursor.execute(
-            """CREATE TABLE feed(url TEXT, title TEXT, subtitle TEXT,
-            description TEXT, time TIME, date DATE, PRIMARY KEY(url))""")
-
-        db_cursor.execute(
-            """CREATE TABLE entry(feed_url TEXT, title TEXT, description TEXT,
-            isread TEXT, time TIME, date DATE, id TEXT, PRIMARY KEY(id))""")
-        db_conn.commit()
-
-        for i in range(10):
-            feed_row = ("url"+str(i), "title"+str(i), "subtitle"+str(i),
-               "description"+str(i), "2008-01-01", "12:00:00")
-            db_cursor.execute(
-                """INSERT INTO feed(url,title,subtitle,description,date,time)
-                VALUES (?,?,?,?,?,?)""", feed_row)
-            db_conn.commit()
-        for i in range(9):
-            if i % 2 == 0:
-                read = "NO"
-            else:
-                read = "YES"
-            entry_row = ("url2", "entry"+str(i), "desc", read, str(i),
-                "2008-01-01", "12:00:0"+str(i))
-            db_cursor.execute(
-                """INSERT INTO entry(feed_url, title, description, isread, id,
-                date, time) VALUES (?,?,?,?,?,?,?)""", entry_row)
-            db_conn.commit()
-        db_conn.close()
-
-        self.library = FeedLibrary(None)
-
-    def tearDown(self):
-        EntertainerTest.tearDown(self)
-
-        db_conn = sqlite.connect(self.config.FEED_DB)
-        db_cursor = db_conn.cursor()
-        db_cursor.execute("""DROP TABLE IF EXISTS feed""")
-        db_cursor.execute("""DROP TABLE IF EXISTS entry""")
-        db_conn.commit()
-        db_conn.close()
-
-    def testIsEmptyWhenFull(self):
-        """
-        testIsEmptyWhenFull: Tests FeedLibrary.is_empty() when there are feeds
-        in database
-        """
-        self.assertFalse(self.library.is_empty())
-
-    def testGetFeeds(self):
-        """
-        testGetFeeds: Tests FeedLibrary.get_feeds() sorted by TITLE
-        """
-        feedlist = self.library.get_feeds('TITLE')
-        for i in range(10):
-            self.assertEqual(feedlist[i].url, "url"+str(i))
-
-    def testGetFeedsByUnread(self):
-        """
-        testGetFeedsByUnread: Tests FeedLibrary.get_feeds() sorted by unread
-        """
-        feedlist = self.library.get_feeds('UNREAD')
-        self.assertEqual(feedlist[0].url, "url2")
-
-    def test_get_latest_entries(self):
-        '''Test that the latest entries are returned.'''
-        latest = self.library.get_latest_entries(1)
-        self.assertEqual("12:00:08", str(latest[0][1].time))
-
-    def testNumberOfFeeds(self):
-        """
-        testNumberOfFeeds: Tests FeedLibrary.number_of_feeds()
-        """
-        self.assertEqual(self.library.number_of_feeds(), 10)
-
-    def testNumberOfUnreadEntries(self):
-        """
-        testNumberOfUnreadEntries: Tests FeedLibrary.number_of_unread_entries()
-        """
-        self.assertEqual(self.library.number_of_unread_entries(), 5)
-
-    def testMarkAllAsRead(self):
-        """
-        testMarkAllAsRead: tests if all entries are marked as read
-        """
-        self.library.mark_all_as_read()
-        self.assertEqual(self.library.number_of_unread_entries(), 0)
-

=== modified file 'entertainerlib/tests/test_models.py'
--- entertainerlib/tests/test_models.py	2009-06-17 03:43:51 +0000
+++ entertainerlib/tests/test_models.py	2010-04-03 15:04:16 +0000
@@ -20,51 +20,6 @@
 class TestBaseModel(ModelTestCase):
     '''BaseModel test case.'''
 
-class TestNewsFeed(ModelTestCase):
-    '''NewsFeed test case'''
-
-    def testCreate(self):
-        '''Test creation of new NewsFeed'''
-
-        store = Store(self.db)
-
-        newsfeed = models.NewsFeed()
-        newsfeed.url = u'http://theironlion.net/blog/feed'
-        newsfeed.title = u'The Iron Lion'
-        newsfeed.description = u'Paul Hummer\'s Blog'
-        store.add(newsfeed)
-        store.commit()
-
-        self.assertTrue(Store.of(newsfeed) is store)
-
-        newsfeed_from_database = store.find(models.NewsFeed,
-            models.NewsFeed.title == u'The Iron Lion').one()
-
-        self.assertTrue(newsfeed is newsfeed_from_database)
-
-
-class TestNewsEntry(ModelTestCase):
-    '''NewsEntry test case'''
-
-    def testCreate(self):
-        '''Test creation of new NewsEntry'''
-
-        store = Store(self.db)
-        newsentry = models.NewsEntry()
-        newsentry.url = u'http://theironlion.net/blog/foo-bar-baz'
-        newsentry.title = u'Foo Bar Baz'
-        newsentry.description = u'There once was a girl from Nantucket'
-        newsentry.is_read = 0
-        store.add(newsentry)
-
-        store.commit()
-
-        self.assertTrue(Store.of(newsentry) is store)
-
-        newsentry_from_database = store.find(models.NewsEntry,
-            models.NewsEntry.title == u'Foo Bar Baz').one()
-        self.assertTrue(newsentry is newsentry_from_database)
-
 
 class TestPhotoAlbum(ModelTestCase):
     '''PhotoAlbum test case'''

=== modified file 'entertainerlib/tests/test_music.py'
--- entertainerlib/tests/test_music.py	2010-01-03 22:58:00 +0000
+++ entertainerlib/tests/test_music.py	2010-04-03 15:04:16 +0000
@@ -1,5 +1,6 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests Music'''
+# pylint: disable-msg=W0212
 
 import os
 
@@ -129,6 +130,7 @@
         bad_track = Track('', '', 1, '', 'foo-bar-baz**', 2, 3, '',
             self.music_library._create_album)
         try:
+            # pylint: disable-msg=W0612
             album = bad_track.album
             self.fail()
         except AlbumHasNoTracks:
@@ -264,7 +266,7 @@
         self.music_library = MusicLibrary()
         self.album = self.music_library._create_album('album1')
 
-    def testAlbumConstructor(self):
+    def test_constructor(self):
         """Test that an Album object is properly constructed"""
         self.assertTrue(isinstance(self.album, Album))
         self.assertEqual(self.album.artist, 'artist0')
@@ -272,13 +274,13 @@
         self.assertEqual(self.album.title, 'album1')
         self.assertEqual(self.album.year, 0)
 
-    def testAlbumConstructorNot(self):
+    def test_constructor_not(self):
         """Test that an AlbumHasNoTracks exception is raised when the created
         album doesn't exist in the cache"""
         self.assertRaises(AlbumHasNoTracks, self.music_library._create_album,
             'foo')
 
-    def testAlbumHasAlbumArt(self):
+    def test_has_album_art(self):
         """Test that album art exists for the file"""
         album_artist = "artist0 - album1"
         album_artist = album_artist.encode("base64")
@@ -288,12 +290,12 @@
         if os.path.exists(album_art):
             os.remove(album_art)
 
-    def testAlbumHasAlbumArtNot(self):
+    def test_has_album_art_not(self):
         """Test that missing album art is reported back"""
         other_album = self.music_library._create_album('album1')
         self.assertFalse(other_album.has_album_art())
 
-    def testAlbumGetAlbumArtUrl(self):
+    def test_album_art_url(self):
         """Test that the path to the album's art is returned"""
         result = self.album.album_art_url
         album_artist = "artist0 - album1"
@@ -301,7 +303,7 @@
         album_art = os.path.join(self.art_path, album_artist + ".jpg")
         self.assertEqual(result, album_art)
 
-    def testAlbumGetTracks(self):
+    def test_tracks(self):
         """Test that all tracks for an album are returned"""
         result = self.album.tracks
         self.assertEqual(len(result), 4)

=== removed file 'entertainerlib/tests/test_opmlparser.py'
--- entertainerlib/tests/test_opmlparser.py	2009-05-10 17:36:49 +0000
+++ entertainerlib/tests/test_opmlparser.py	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-# Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
-'''Tests OPMLParser'''
-# pylint: disable-msg=C0301
-
-import os
-import xml.parsers.expat
-
-from entertainerlib.backend.components.feeds.feed_utils import OPMLParser
-from entertainerlib.tests import EntertainerTest
-
-THIS_DIR = os.path.dirname(__file__)
-
-
-class OPMLParserTest(EntertainerTest):
-    '''Test OPMLParser'''
-
-    def setUp(self):
-        '''See unittest.TestCase'''
-        EntertainerTest.setUp(self)
-
-        #set up lists and paths
-        self.testURL = "http://www.scripting.com/feeds/top100.opml"
-        self.multipleLifereaFolders = (THIS_DIR +
-            '/data/OPMLParser/lifereaMultiple')
-        self.singleLifereaFolder = (THIS_DIR +
-            '/data/OPMLParser/lifereaSingle')
-        self.noLifereaFolder = (THIS_DIR +
-            '/data/OPMLParser/lifereaNoFolder')
-        self.noLifereaFile = (THIS_DIR +
-            '/data/OPMLParser/lifereaNoFile')
-        self.okFilePath = (THIS_DIR +
-            '/data/OPMLParser/test.opml')
-        self.badFilePath = THIS_DIR + '/data/OPMLParser/null.opml'
-        self.notXMLFile = THIS_DIR + '/data/OPMLParser/noXML.txt'
-        self.insideFilePath = (THIS_DIR +
-            '/data/OPMLParser/opmlInOpml.opml')
-        self.feedList = [
-            "http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/front_page/rss.xml",
-            "http://www.hackaday.com/rss.xml",
-            "http://edevelop.org/planet/rss20.xml",
-            "http://feeds.feedburner.com/BlenderartMagazine"]
-
-    def testGetRssFeeds001(self):
-        """Check if OPMLParser can parse a normal file"""
-        output = OPMLParser().get_rss_feeds(self.okFilePath)
-        self.assertEqual(output, self.feedList)
-
-    def testGetRssFeeds002(self):
-        """Check if OPMLParser can handle a non-existant file"""
-        self.assertRaises(IOError, OPMLParser().get_rss_feeds,
-            self.badFilePath)
-
-    def testGetRssFeeds003(self):
-        """Check if OPMLParser discards opml links inside the file
-        This is the same file as for testGetRssFeeds001 with an extra link to
-        an opml file.
-
-        The OPMLParser should discard the opml file and return the rest of the
-        links
-        """
-        output = OPMLParser().get_rss_feeds(self.insideFilePath)
-        self.assertEqual(output, self.feedList)
-
-    def testGetRssFeeds004(self):
-        """Check if OPMLParser can handle a file which is not an opml file or
-        even an xml file
-        """
-        self.assertRaises(xml.parsers.expat.ExpatError,
-            OPMLParser().get_rss_feeds, self.notXMLFile)
-
-    def testGetRssFeeds005(self):
-        """Check if OPMLParser can handle a URL"""
-        output = OPMLParser().get_rss_feeds(self.testURL)
-        self.assertTrue(output != [])
-
-    def testGetLifereaOpml001(self):
-        """Check if OPMLParser can pick the opml file for liferea"""
-        output = OPMLParser().get_liferea_opml(self.singleLifereaFolder)
-        self.assertEqual(output,
-            self.singleLifereaFolder+"/.liferea/feedlist.opml")
-
-    def testGetLifereaOpml002(self):
-        """Check if OPMLParser can pick the opml file for the latest version
-        of liferea out of a selection of folders
-        """
-        output = OPMLParser().get_liferea_opml(self.multipleLifereaFolders)
-        self.assertEqual(output,
-            self.multipleLifereaFolders+"/.liferea_1.4/feedlist.opml")
-
-    def testGetLifereaOpml003(self):
-        """Check if OPMLParser returns an empty string if it can't find the
-        liferea opml folder
-        """
-        output = OPMLParser().get_liferea_opml(self.noLifereaFolder)
-        self.assertEqual(output, "")
-
-    def testGetLifereaOpml004(self):
-        """Check if OPMLParser returns an empty string if it can't find the
-        liferea opml file
-        """
-        output = OPMLParser().get_liferea_opml(self.noLifereaFile)
-        self.assertEqual(output, "")
-

=== modified file 'entertainerlib/tests/test_screenfactory.py'
--- entertainerlib/tests/test_screenfactory.py	2009-06-17 02:49:44 +0000
+++ entertainerlib/tests/test_screenfactory.py	2010-04-03 15:04:16 +0000
@@ -4,13 +4,12 @@
 
 import os
 
+from entertainerlib.client.medialibrary import music
 from entertainerlib.gui.screens.album import Album
 from entertainerlib.gui.screens.artist import Artist
 from entertainerlib.gui.screens.audio_play import AudioPlay
 from entertainerlib.gui.screens.disc import Disc
 from entertainerlib.gui.screens.factory import ScreenFactory
-from entertainerlib.gui.screens.feed import Feed
-from entertainerlib.gui.screens.feed_entry import FeedEntry
 from entertainerlib.gui.screens.main import Main
 from entertainerlib.gui.screens.movie import Movie
 from entertainerlib.gui.screens.music import Music
@@ -18,23 +17,17 @@
 from entertainerlib.gui.screens.photo_albums import PhotoAlbums
 from entertainerlib.gui.screens.photographs import Photographs
 from entertainerlib.gui.screens.question import Question
-from entertainerlib.gui.screens.rss import Rss
 from entertainerlib.gui.screens.tv_episodes import TvEpisodes
 from entertainerlib.gui.screens.tv_series import TvSeries
 from entertainerlib.gui.screens.video_osd import VideoOSD
 from entertainerlib.gui.screens.video import Video
 from entertainerlib.gui.screens.weather import WeatherScreen
 from entertainerlib.tests import EntertainerTest
-from entertainerlib.tests.mock import MockAlbum
-from entertainerlib.tests.mock import MockEntry
-from entertainerlib.tests.mock import MockFeed
-from entertainerlib.tests.mock import MockFeedLibrary
 from entertainerlib.tests.mock import MockImage
 from entertainerlib.tests.mock import MockImageLibrary
 from entertainerlib.tests.mock import MockMediaPlayer
 from entertainerlib.tests.mock import MockMovie
 from entertainerlib.tests.mock import MockMusicLibrary
-from entertainerlib.tests.mock import MockTrack
 from entertainerlib.tests.mock import MockTVSeries
 from entertainerlib.tests.mock import MockVideoLibrary
 
@@ -45,12 +38,11 @@
     def setUp(self):
         EntertainerTest.setUp(self)
 
-        feed_library = MockFeedLibrary()
         image_libary = MockImageLibrary()
         music_library = MockMusicLibrary()
         media_player = MockMediaPlayer()
         video_library = MockVideoLibrary()
-        self.factory = ScreenFactory(feed_library, image_libary, music_library,
+        self.factory = ScreenFactory(image_libary, music_library,
             video_library, media_player, None, None)
 
         self.kwargs = {}
@@ -61,7 +53,7 @@
 
     def test__generate_album(self):
         '''Test _generate_album returns a Album screen'''
-        self.kwargs['album'] = MockAlbum()
+        self.kwargs['album'] = music.Album('', '', 240, 2010, '', [])
         screen = self.factory._generate_album(self.kwargs)
         self.assertTrue(isinstance(screen, Album))
 
@@ -73,7 +65,9 @@
 
     def test__generate_audio_play(self):
         '''Test _generate_audio_play returns a AudioPlay screen'''
-        self.kwargs['track'] = MockTrack()
+        album = music.Album('', '', 240, 2010, '', [])
+        track = music.Track('', '', 1, '', album, 2010, 60, '', None)
+        self.kwargs['track'] = track
         screen = self.factory._generate_audio_play(self.kwargs)
         self.assertTrue(isinstance(screen, AudioPlay))
 
@@ -82,19 +76,6 @@
         screen = self.factory._generate_disc(self.kwargs)
         self.assertTrue(isinstance(screen, Disc))
 
-    def test__generate_feed(self):
-        '''Test _generate_feed returns a Feed screen'''
-        self.kwargs['feed'] = MockFeed()
-        screen = self.factory._generate_feed(self.kwargs)
-        self.assertTrue(isinstance(screen, Feed))
-
-    def test__generate_feed_entry(self):
-        '''Test _generate_feed_entry returns a FeedEntry screen'''
-        self.kwargs['entry'] = MockEntry()
-        self.kwargs['feed'] = MockFeed()
-        screen = self.factory._generate_feed_entry(self.kwargs)
-        self.assertTrue(isinstance(screen, FeedEntry))
-
     def test__generate_main(self):
         '''Test _generate_main returns a Main screen'''
         screen = self.factory._generate_main(self.kwargs)
@@ -140,11 +121,6 @@
         screen = self.factory._generate_question(self.kwargs)
         self.assertTrue(isinstance(screen, Question))
 
-    def test__generate_rss(self):
-        '''Test _generate_rss returns a Rss screen'''
-        screen = self.factory._generate_rss(self.kwargs)
-        self.assertTrue(isinstance(screen, Rss))
-
     def test__generate_tv_series(self):
         '''Test _generate_tv_series returns a TvSeries screen'''
         self.kwargs['tv_series'] = MockTVSeries()

=== modified file 'entertainerlib/tests/test_userinterface.py'
--- entertainerlib/tests/test_userinterface.py	2009-06-17 03:22:28 +0000
+++ entertainerlib/tests/test_userinterface.py	2010-04-03 15:04:16 +0000
@@ -8,7 +8,6 @@
 from entertainerlib.gui.user_interface import UserInterface
 from entertainerlib.tests import EntertainerTest
 from entertainerlib.tests.mock import MockClutterKeyboardEvent
-from entertainerlib.tests.mock import MockFeedLibrary
 
 
 class UserInterfaceTest(EntertainerTest):
@@ -17,8 +16,7 @@
     def setUp(self):
         EntertainerTest.setUp(self)
 
-        feed_library = MockFeedLibrary()
-        self.ui = UserInterface(feed_library, None, None, None, None)
+        self.ui = UserInterface(None, None, None, None)
 
     def test_create(self):
         '''Test correct UserInterface initialization'''

=== modified file 'entertainerlib/tests/test_videometadatasearch.py'
--- entertainerlib/tests/test_videometadatasearch.py	2009-05-09 15:45:18 +0000
+++ entertainerlib/tests/test_videometadatasearch.py	2010-04-03 15:04:16 +0000
@@ -1,7 +1,6 @@
 # Copyright (c) 2009 Entertainer Developers - See COPYING - GPLv2
 '''Tests VideoMetadataSearch'''
 
-# XXX: rockstar - Modules should not get this deep
 from entertainerlib.backend.components.mediacache.video_metadata_search import (
     VideoMetadataSearch)
 from entertainerlib.tests import EntertainerTest

=== modified file 'entertainerlib/uis/manager.ui'
--- entertainerlib/uis/manager.ui	2009-11-11 10:22:36 +0000
+++ entertainerlib/uis/manager.ui	2010-04-03 15:04:16 +0000
@@ -1,24 +1,24 @@
 <?xml version="1.0"?>
-<!--*- mode: xml -*-->
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
+    <property name="value">60</property>
+    <property name="lower">15</property>
     <property name="upper">900</property>
-    <property name="lower">15</property>
-    <property name="page_increment">10</property>
     <property name="step_increment">1</property>
-    <property name="page_size">0</property>
-    <property name="value">60</property>
+    <property name="page_increment">0</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
+    <property name="value">1</property>
     <property name="upper">100</property>
-    <property name="lower">0</property>
+    <property name="step_increment">1</property>
     <property name="page_increment">10</property>
-    <property name="step_increment">1</property>
-    <property name="page_size">10</property>
-    <property name="value">1</property>
+    <property name="page_size">0</property>
   </object>
   <object class="GtkListStore" id="model1">
     <columns>
+      <!-- column-name gchararray -->
       <column type="gchararray"/>
     </columns>
     <data>
@@ -37,199 +37,141 @@
     </data>
   </object>
   <object class="GtkDialog" id="ManagerDialog">
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="title" translatable="yes">Entertainer Manager</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
     <property name="modal">True</property>
-    <property name="resizable">True</property>
-    <property name="destroy_with_parent">False</property>
     <property name="icon_name">applications-multimedia</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
+    <property name="type_hint">dialog</property>
     <property name="has_separator">False</property>
-    <signal handler="on_ManagerDialog_destroy" last_modification_time="Sun, 23 Aug 2009 00:27:03 GMT" name="destroy"/>
+    <signal name="destroy" handler="on_ManagerDialog_destroy"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-layout">
         <property name="visible">True</property>
-        <property name="homogeneous">False</property>
         <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-closebutton-area">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <object class="GtkButton" id="close_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="label">gtk-close</property>
-                <property name="use_stock">True</property>
-                <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="focus_on_click">True</property>
-                <signal handler="on_close_button_clicked" name="clicked"/>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="padding">0</property>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkNotebook" id="tabs">
             <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="has_focus">True</property>
             <property name="can_default">True</property>
             <property name="has_default">True</property>
-            <property name="can_focus">True</property>
-            <property name="has_focus">True</property>
-            <property name="show_tabs">True</property>
-            <property name="show_border">True</property>
-            <property name="tab_pos">GTK_POS_TOP</property>
-            <property name="scrollable">False</property>
-            <property name="enable_popup">False</property>
             <child>
               <object class="GtkVBox" id="vbox_media">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
-                <property name="spacing">0</property>
                 <child>
                   <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="spacing">0</property>
                     <child>
                       <object class="GtkFrame" id="frame_video_lib1">
+                        <property name="visible">True</property>
                         <property name="border_width">5</property>
-                        <property name="visible">True</property>
                         <property name="label_xalign">0</property>
-                        <property name="label_yalign">0.5</property>
-                        <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
                         <child>
                           <object class="GtkVBox" id="vbox2">
                             <property name="visible">True</property>
-                            <property name="homogeneous">False</property>
-                            <property name="spacing">0</property>
                             <child>
                               <object class="GtkLabel" id="label_media_folder_tip1">
                                 <property name="visible">True</property>
-                                <property name="label" translatable="yes">Entertainer will catalog the media in the folders below.</property>
-                                <property name="use_underline">False</property>
-                                <property name="use_markup">False</property>
-                                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                <property name="wrap">True</property>
-                                <property name="selectable">False</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
                                 <property name="xpad">5</property>
-                                <property name="ypad">0</property>
-                                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                <property name="width_chars">-1</property>
+                                <property name="label" translatable="yes">Entertainer will catalog the media in the folders below.</property>
+                                <property name="wrap">True</property>
                                 <property name="single_line_mode">True</property>
-                                <property name="angle">0</property>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
                                 <property name="padding">5</property>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" id="hbox2">
                                 <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">0</property>
                                 <child>
                                   <object class="GtkScrolledWindow" id="scrolledwindow1">
-                                    <property name="border_width">5</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-                                    <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                                    <property name="border_width">5</property>
+                                    <property name="hscrollbar_policy">automatic</property>
+                                    <property name="vscrollbar_policy">automatic</property>
                                     <child>
                                       <object class="GtkTreeView" id="treeview_media">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <property name="headers_visible">True</property>
-                                        <property name="rules_hint">False</property>
-                                        <property name="reorderable">False</property>
                                         <property name="enable_search">False</property>
-                                        <property name="fixed_height_mode">False</property>
-                                        <property name="hover_selection">False</property>
-                                        <property name="hover_expand">False</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkVButtonBox" id="vbuttonbox1">
+                                    <property name="visible">True</property>
                                     <property name="border_width">5</property>
-                                    <property name="visible">True</property>
-                                    <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
                                     <property name="spacing">2</property>
                                     <child>
                                       <object class="GtkButton" id="button_add_folder">
+                                        <property name="label">gtk-add</property>
                                         <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="has_focus">True</property>
                                         <property name="can_default">True</property>
                                         <property name="has_default">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="has_focus">True</property>
-                                        <property name="label">gtk-add</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_stock">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <signal handler="on_button_add_media_clicked" last_modification_time="Sat, 11 Jul 2009 19:03:28 GMT" name="clicked"/>
+                                        <signal name="clicked" handler="on_button_add_media_clicked"/>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="button_remove_folder">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
                                         <property name="label">gtk-remove</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_stock">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <signal handler="on_button_remove_media_clicked" last_modification_time="Sat, 11 Jul 2009 19:03:39 GMT" name="clicked"/>
+                                        <signal name="clicked" handler="on_button_remove_media_clicked"/>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="button_edit_folder">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
                                         <property name="label">gtk-edit</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
                                         <property name="use_stock">True</property>
-                                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                                        <property name="focus_on_click">True</property>
-                                        <signal handler="on_button_edit_media_clicked" last_modification_time="Sat, 11 Jul 2009 19:03:49 GMT" name="clicked"/>
+                                        <signal name="clicked" handler="on_button_edit_media_clicked"/>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="expand">False</property>
                                     <property name="padding">5</property>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
@@ -238,563 +180,207 @@
                           <object class="GtkLabel" id="label_media_library">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">&lt;b&gt;Media Library&lt;/b&gt;</property>
-                            <property name="use_underline">False</property>
                             <property name="use_markup">True</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkVBox" id="vbox23">
+                        <property name="visible">True</property>
                         <property name="border_width">5</property>
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">0</property>
                         <child>
                           <object class="GtkCheckButton" id="video_metadata_checkbox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Download movie and TV-series metadata</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="on_checkbutton_video_metadata_toggled" last_modification_time="Sat, 11 Jul 2009 19:09:32 GMT" name="toggled"/>
+                            <signal name="toggled" handler="on_checkbutton_video_metadata_toggled"/>
                           </object>
                           <packing>
-                            <property name="padding">1</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="padding">1</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="art_checkbox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Download album cover art</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="on_art_checkbox_toggled" name="toggled"/>
+                            <signal name="toggled" handler="on_art_checkbox_toggled"/>
                           </object>
                           <packing>
-                            <property name="padding">1</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="padding">1</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="lyrics_checkbox">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
                             <property name="label" translatable="yes">Download song lyrics</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
-                            <property name="relief">GTK_RELIEF_NORMAL</property>
-                            <property name="focus_on_click">True</property>
-                            <property name="active">False</property>
-                            <property name="inconsistent">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal handler="on_lyrics_checkbox_toggled" name="toggled"/>
+                            <signal name="toggled" handler="on_lyrics_checkbox_toggled"/>
                           </object>
                           <packing>
-                            <property name="padding">1</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="padding">1</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
-                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="button_media_rebuild">
-                        <property name="border_width">5</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Rebuild media cache</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="border_width">5</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="tab_expand">False</property>
-                <property name="tab_fill">True</property>
-              </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label_media">
                 <property name="visible">True</property>
-                <property name="has_default">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
                 <property name="label" translatable="yes">Media</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkVBox" id="vbox_feeds">
-                <property name="visible">True</property>
-                <property name="homogeneous">False</property>
-                <property name="spacing">0</property>
-                <child>
-                  <object class="GtkFrame" id="frame_rss_feeds3">
-                    <property name="border_width">5</property>
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="label_yalign">0.5</property>
-                    <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-                    <child>
-                      <object class="GtkVBox" id="vbox17">
-                        <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">0</property>
-                        <child>
-                          <object class="GtkLabel" id="label_rss_tip3">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Below is a list of RSS feeds that are displayed in Entertainer.</property>
-                            <property name="use_underline">False</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">5</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
-                          </object>
-                          <packing>
-                            <property name="padding">5</property>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHBox" id="hbox16">
-                            <property name="visible">True</property>
-                            <property name="homogeneous">False</property>
-                            <property name="spacing">0</property>
-                            <child>
-                              <object class="GtkScrolledWindow" id="scrolledwindow_rss3">
-                                <property name="border_width">5</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
-                                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-                                <child>
-                                  <object class="GtkTreeView" id="treeview_feeds">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="headers_visible">True</property>
-                                    <property name="rules_hint">False</property>
-                                    <property name="reorderable">False</property>
-                                    <property name="enable_search">False</property>
-                                    <property name="fixed_height_mode">False</property>
-                                    <property name="hover_selection">False</property>
-                                    <property name="hover_expand">False</property>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkVButtonBox" id="vbuttonbox8">
-                                <property name="border_width">5</property>
-                                <property name="visible">True</property>
-                                <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-                                <property name="spacing">2</property>
-                                <child>
-                                  <object class="GtkButton" id="button_add_feed">
-                                    <property name="visible">True</property>
-                                    <property name="tooltip-text" translatable="yes">Add RSS Feed</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label">gtk-add</property>
-                                    <property name="use_stock">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <signal handler="on_button_add_feed_clicked" name="clicked"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="button_remove_feed">
-                                    <property name="visible">True</property>
-                                    <property name="tooltip-text" translatable="yes">Remove RSS Feed</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label">gtk-remove</property>
-                                    <property name="use_stock">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <signal handler="on_button_remove_feed_clicked" name="clicked"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="button_edit_feed">
-                                    <property name="visible">True</property>
-                                    <property name="tooltip-text" translatable="yes">Edit current item</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label">gtk-edit</property>
-                                    <property name="use_stock">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <signal handler="on_button_edit_feed_clicked" name="clicked"/>
-                                  </object>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="button_open_list">
-                                    <property name="visible">True</property>
-                                    <property name="tooltip-text" translatable="yes">Add feeds from a datasource</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label">gtk-open</property>
-                                    <property name="use_stock">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <signal handler="on_button_open_list_clicked" name="clicked"/>
-                                  </object>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="padding">5</property>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label_rss_sources3">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;RSS feeds&lt;/b&gt;</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">True</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkHBox" id="hbox17">
-                    <property name="border_width">5</property>
-                    <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="spacing">0</property>
-                    <child>
-                      <object class="GtkLabel" id="label12">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Update all feeds every</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
-                      </object>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="fetch_interval_spinbutton">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="climb_rate">1</property>
-                        <property name="digits">0</property>
-                        <property name="numeric">True</property>
-                        <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                        <property name="snap_to_ticks">False</property>
-                        <property name="wrap">False</property>
-                        <property name="adjustment">adjustment1</property>
-                        <signal handler="on_fetch_interval_spinbutton_value_changed" name="value_changed"/>
-                      </object>
-                      <packing>
-                        <property name="padding">5</property>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label13">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">minutes.</property>
-                        <property name="use_underline">False</property>
-                        <property name="use_markup">False</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
-                      </object>
-                      <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="button_feed_rebuild">
-                    <property name="border_width">5</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Rebuild RSS feed cache</property>
-                    <property name="use_underline">True</property>
-                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                    <property name="focus_on_click">True</property>
-                    <signal handler="on_button_feed_rebuild_clicked" last_modification_time="Sat, 22 Aug 2009 18:13:42 GMT" name="clicked"/>
-                  </object>
-                  <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
               </object>
               <packing>
-                <property name="tab_expand">False</property>
-                <property name="tab_fill">True</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label_rss3">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">RSS feeds</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.5</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
-              </object>
-            </child>
             <child>
               <object class="GtkVBox" id="vbox5">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
-                <property name="spacing">0</property>
                 <child>
                   <object class="GtkFrame" id="frame_video_lib3">
+                    <property name="visible">True</property>
                     <property name="border_width">5</property>
-                    <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="label_yalign">0.5</property>
-                    <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
                     <child>
                       <object class="GtkVBox" id="weather_location_list_area">
                         <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">0</property>
                         <child>
                           <object class="GtkLabel" id="label_weather_tip">
                             <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">5</property>
                             <property name="label" translatable="yes">Get weather conditions from the locations listed below.</property>
-                            <property name="use_underline">False</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">5</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
                             <property name="single_line_mode">True</property>
-                            <property name="angle">0</property>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="padding">5</property>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkHBox" id="hbox4">
                             <property name="visible">True</property>
-                            <property name="homogeneous">False</property>
-                            <property name="spacing">0</property>
                             <child>
                               <object class="GtkScrolledWindow" id="scrolledwindow3">
-                                <property name="border_width">5</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
-                                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                                <property name="border_width">5</property>
+                                <property name="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
                                 <child>
                                   <object class="GtkTreeView" id="treeview_locations">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <property name="headers_visible">True</property>
-                                    <property name="rules_hint">False</property>
-                                    <property name="reorderable">False</property>
                                     <property name="enable_search">False</property>
-                                    <property name="fixed_height_mode">False</property>
-                                    <property name="hover_selection">False</property>
-                                    <property name="hover_expand">False</property>
                                   </object>
                                 </child>
                               </object>
                               <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkVButtonBox" id="vbuttonbox3">
+                                <property name="visible">True</property>
                                 <property name="border_width">5</property>
-                                <property name="visible">True</property>
-                                <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
                                 <property name="spacing">2</property>
                                 <child>
                                   <object class="GtkButton" id="button_add_weather">
+                                    <property name="label">gtk-new</property>
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="has_focus">True</property>
                                     <property name="can_default">True</property>
                                     <property name="has_default">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="has_focus">True</property>
-                                    <property name="label">gtk-new</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <signal handler="on_button_add_weather_clicked" name="clicked"/>
+                                    <signal name="clicked" handler="on_button_add_weather_clicked"/>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="button_remove_weather">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
                                     <property name="label">gtk-clear</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <signal handler="on_button_remove_weather_clicked" name="clicked"/>
+                                    <signal name="clicked" handler="on_button_remove_weather_clicked"/>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
                                 <property name="padding">5</property>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
@@ -803,203 +389,151 @@
                       <object class="GtkLabel" id="label_weather_options">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">&lt;b&gt;Weather locations&lt;/b&gt;</property>
-                        <property name="use_underline">False</property>
                         <property name="use_markup">True</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox7">
+                    <property name="visible">True</property>
                     <property name="border_width">5</property>
-                    <property name="visible">True</property>
-                    <property name="homogeneous">False</property>
-                    <property name="spacing">0</property>
                     <child>
                       <object class="GtkCheckButton" id="weather_display_checkbox">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
                         <property name="label" translatable="yes">Display weather option in main menu</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
-                        <property name="relief">GTK_RELIEF_NORMAL</property>
-                        <property name="focus_on_click">True</property>
                         <property name="active">True</property>
-                        <property name="inconsistent">False</property>
                         <property name="draw_indicator">True</property>
-                        <signal handler="on_weather_display_checkbox_toggled" name="toggled"/>
+                        <signal name="toggled" handler="on_weather_display_checkbox_toggled"/>
                       </object>
                       <packing>
-                        <property name="padding">0</property>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="tab_expand">False</property>
-                <property name="tab_fill">True</property>
+                <property name="position">1</property>
               </packing>
             </child>
             <child type="tab">
               <object class="GtkLabel" id="label_weather">
                 <property name="visible">True</property>
+                <property name="yalign">0.40999999642372131</property>
                 <property name="label" translatable="yes">Weather</property>
-                <property name="use_underline">False</property>
-                <property name="use_markup">False</property>
-                <property name="justify">GTK_JUSTIFY_LEFT</property>
-                <property name="wrap">False</property>
-                <property name="selectable">False</property>
-                <property name="xalign">0.5</property>
-                <property name="yalign">0.409999996424</property>
-                <property name="xpad">0</property>
-                <property name="ypad">0</property>
-                <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                <property name="width_chars">-1</property>
-                <property name="single_line_mode">False</property>
-                <property name="angle">0</property>
               </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
             </child>
             <child>
               <object class="GtkVBox" id="vbox25">
                 <property name="visible">True</property>
-                <property name="homogeneous">False</property>
-                <property name="spacing">0</property>
                 <child>
                   <object class="GtkFrame" id="frame8">
+                    <property name="visible">True</property>
                     <property name="border_width">5</property>
-                    <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="label_yalign">0.5</property>
-                    <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
                     <child>
                       <object class="GtkVBox" id="vbox27">
                         <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">0</property>
                         <child>
                           <object class="GtkLabel" id="label38">
                             <property name="visible">True</property>
+                            <property name="xalign">0</property>
+                            <property name="xpad">5</property>
                             <property name="label" translatable="yes">Below is a list of accessible themes.</property>
-                            <property name="use_underline">False</property>
-                            <property name="use_markup">False</property>
-                            <property name="justify">GTK_JUSTIFY_LEFT</property>
-                            <property name="wrap">False</property>
-                            <property name="selectable">False</property>
-                            <property name="xalign">0</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">5</property>
-                            <property name="ypad">0</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                            <property name="width_chars">-1</property>
-                            <property name="single_line_mode">False</property>
-                            <property name="angle">0</property>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="padding">5</property>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkHBox" id="hbox21">
                             <property name="visible">True</property>
-                            <property name="homogeneous">False</property>
-                            <property name="spacing">0</property>
                             <child>
                               <object class="GtkScrolledWindow" id="scrolledwindow8">
-                                <property name="border_width">5</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
-                                <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+                                <property name="border_width">5</property>
+                                <property name="hscrollbar_policy">automatic</property>
+                                <property name="vscrollbar_policy">automatic</property>
                                 <child>
                                   <object class="GtkTreeView" id="theme_list">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="headers_visible">False</property>
-                                    <property name="rules_hint">False</property>
-                                    <property name="reorderable">False</property>
                                     <property name="enable_search">False</property>
-                                    <property name="fixed_height_mode">False</property>
-                                    <property name="hover_selection">False</property>
-                                    <property name="hover_expand">False</property>
-                                    <signal handler="on_theme_list_cursor_changed" last_modification_time="Sat, 22 Aug 2009 21:26:24 GMT" name="cursor_changed"/>
+                                    <signal name="cursor_changed" handler="on_theme_list_cursor_changed"/>
                                   </object>
                                 </child>
                               </object>
                               <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkVButtonBox" id="vbuttonbox9">
+                                <property name="visible">True</property>
                                 <property name="border_width">5</property>
-                                <property name="visible">True</property>
-                                <property name="layout_style">GTK_BUTTONBOX_START</property>
                                 <property name="spacing">2</property>
+                                <property name="layout_style">start</property>
                                 <child>
                                   <object class="GtkButton" id="theme_add_button">
+                                    <property name="label">gtk-add</property>
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label">gtk-add</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <signal handler="on_theme_add_button_clicked" last_modification_time="Sat, 22 Aug 2009 23:52:40 GMT" name="clicked"/>
+                                    <signal name="clicked" handler="on_theme_add_button_clicked"/>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="theme_remove_button">
+                                    <property name="label">gtk-remove</property>
                                     <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
                                     <property name="can_default">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="label">gtk-remove</property>
+                                    <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <property name="relief">GTK_RELIEF_NORMAL</property>
-                                    <property name="focus_on_click">True</property>
-                                    <signal handler="on_theme_remove_button_clicked" last_modification_time="Sat, 22 Aug 2009 23:55:25 GMT" name="clicked"/>
+                                    <signal name="clicked" handler="on_theme_remove_button_clicked"/>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="padding">0</property>
                                 <property name="expand">False</property>
-                                <property name="fill">True</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="padding">0</property>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
@@ -1008,371 +542,196 @@
                       <object class="GtkLabel" id="label25">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">&lt;b&gt;Themes&lt;/b&gt;</property>
-                        <property name="use_underline">False</property>
                         <property name="use_markup">True</property>
-                        <property name="justify">GTK_JUSTIFY_LEFT</property>
-                        <property name="wrap">False</property>
-                        <property name="selectable">False</property>
-                        <property name="xalign">0.5</property>
-                        <property name="yalign">0.5</property>
-                        <property name="xpad">0</property>
-                        <property name="ypad">0</property>
-                        <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                        <property name="width_chars">-1</property>
-                        <property name="single_line_mode">False</property>
-                        <property name="angle">0</property>
                       </object>
                     </child>
                   </object>
                   <packing>
-                    <property name="padding">0</property>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame9">
+                    <property name="visible">True</property>
                     <property name="border_width">5</property>
-                    <property name="visible">True</property>
                     <property name="label_xalign">0</property>
-                    <property name="label_yalign">0.5</property>
-                    <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
                     <child>
                       <object class="GtkHBox" id="hbox22">
                         <property name="visible">True</property>
-                        <property name="homogeneous">False</property>
-                        <property name="spacing">0</property>
                         <child>
                           <object class="GtkImage" id="theme_image">
                             <property name="visible">True</property>
-                            <property name="icon_size">4</property>
+                            <property name="ypad">5</property>
                             <property name="icon_name">gtk-missing-image</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="xpad">0</property>
-                            <property name="ypad">5</property>
                           </object>
                           <packing>
-                            <property name="padding">5</property>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="padding">5</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkVBox" id="vbox26">
                             <property name="visible">True</property>
-                            <property name="homogeneous">False</property>
-                            <property name="spacing">0</property>
                             <child>
                               <object class="GtkHBox" id="hbox23">
+                                <property name="visible">True</property>
                                 <property name="border_width">2</property>
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">0</property>
                                 <child>
                                   <object class="GtkLabel" id="label28">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">&lt;b&gt;Name: &lt;/b&gt;</property>
-                                    <property name="use_underline">False</property>
                                     <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="name_label">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes"/>
-                                    <property name="use_underline">False</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" id="hbox24">
+                                <property name="visible">True</property>
                                 <property name="border_width">2</property>
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">0</property>
                                 <child>
                                   <object class="GtkLabel" id="label29">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">&lt;b&gt;Author: &lt;/b&gt;</property>
-                                    <property name="use_underline">False</property>
                                     <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="author_label">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes"/>
-                                    <property name="use_underline">False</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" id="hbox25">
+                                <property name="visible">True</property>
                                 <property name="border_width">2</property>
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">0</property>
                                 <child>
                                   <object class="GtkLabel" id="label30">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">&lt;b&gt;License: &lt;/b&gt;</property>
-                                    <property name="use_underline">False</property>
                                     <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="license_label">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes"/>
-                                    <property name="use_underline">False</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="padding">0</property>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
+                                <property name="position">2</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" id="hbox26">
+                                <property name="visible">True</property>
                                 <property name="border_width">2</property>
-                                <property name="visible">True</property>
-                                <property name="homogeneous">False</property>
-                                <property name="spacing">0</property>
                                 <child>
                                   <object class="GtkLabel" id="label31">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">&lt;b&gt;Copyright: &lt;/b&gt;</property>
-                                    <property name="use_underline">False</property>
                                     <property name="use_markup">True</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>
-                                    <property name="selectable">False</property>
-                                    <property name="xalign">0.5</property>
-                                    <property name="yalign">0.5</property>
-                                    <property name="xpad">0</property>
-                                    <property name="ypad">0</property>
-                                    <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                                    <property name="width_chars">-1</property>
-                                    <property name="single_line_mode">False</property>
-                                    <property name="angle">0</property>
                                   </object>
                                   <packing>
-                                    <property name="padding">0</property>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
+                                    <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkLabel" id="copyright_label">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes"/>
-                                    <property name="use_underline">False</property>
-                                    <property name="use_markup">False</property>
-                                    <property name="justify">GTK_JUSTIFY_LEFT</property>
-                                    <property name="wrap">False</property>