Merge lp:~gabor-karsay/awn-extras/comics into lp:awn-extras

[Gabor Karsay]

This brunch adds a plugin to Comics! applet, the SimpleScreenScraper. It indexes images on a web page, lets the user decide which one contains the comic and then shows this image by its index. No previous strips shown, just the one actually at display. This plugin is always used when there is no feed available.

All comics from old comic applet are included, except for "Born loser" – the URL doesn't exist anymore. The old applet is removed from source tree. Note that while the old comics can be viewed, the ones without a feed have less functionality: no going back in history; and showing a higher resolution strip isn't supported either.

The context menu changed: There is only one item "My comics" instead of the 2 items "Comics" and "Manage Comics". There are no "common" comics anymore (preinstalled comics that couldn't be removed).

Adding a comic can be done in two ways: selecting from a list of preconfigured comics or by adding an URL.

Restored the context menu for the strips (a regression at porting to 0.4)

Added an about window.

Fixes two rare crashes (admittedly I don't know the reason for one of them, bug #356334 , the crash is avoided in rev. 1432)

[Gabor Karsay (gabor-karsay)]

Argh, gocomics.com was o.k. last week, now they apparently changed something with the feed and it doesn't work anymore. The old feeds are not shown, new ones can't be added.

review: Needs Fixing

[onox (onox)]

I'm not sure about the preinstalled comics. Best thing would be that the user could retrieve a list of comics (fetching the data from comics.com or some other website) and then choose which he/she would like to add. This way we can also avoid those "feature" requests from random users who want to see some random comic that nobody reads getting added :p

[Gabor Karsay (gabor-karsay)]

Fixed the change in gocomics' feeds and a change in glade-3.

Referring to the preinstalled comics: I can't see a way to retrieve a list of comics automatically from gocomics.com (neither from comics.com, which requires registration and has very strict terms of use). So we'd probably have to create this list and maintain it ourselves - and that would be the same as preinstalling some of them (the user can still decide whether these comics are shown or not).

Actually users can add comics using the assistant. They only have to know the URL of the feed and then select the image showing the comic. It's as easy as copy & paste a backtrace to a bug report. That means: it might be way too difficult for some users ;-) That's why we have some preinstalled comics.

I agree that some of the preinstalled comics are not suited for a wide audience. I'm inclined to remove buttersafe and explosm because they are sort of weird. gocomics.com can sort its comics by popularity. I added Calvin & Hobbes because it's the most popular comic, Garfield is #3. wulffmorgenthaler was a user request, it is regularly updated and I like it (but some strips may be not suitable for children, lets say aged 12 or less).

review: Needs Resubmitting

[onox (onox)]

Imho a -1 for Explosm and wulffmorgenthaler

Gabor, if you could fix lp bug #547154 in this branch, you would make moonbeam very happy :)

[onox (onox)]

Oh, and +1 for removing old comic applet.

[Gabor Karsay (gabor-karsay)]

I'll have a look at that bug, might take some time.

[Gabor Karsay (gabor-karsay)]

No comments? I'll merge this weekend then.

[moonbeam (rcryderman)]

Sounds good.

[lp:~gabor-karsay/awn-extras/comics]

1460. By Gabor Karsay on 2011-01-09

Update comics: Pearls before Swine new URL (old one not updated), gocomics.com changed image index

=== modified file 'applets/maintained/comics/Makefile.am'
--- applets/maintained/comics/Makefile.am	2010-01-26 03:46:15 +0000
+++ applets/maintained/comics/Makefile.am	2011-01-09 09:07:16 +0000
@@ -27,6 +27,9 @@
 feedsdir = $(applet_datadir)/feeds
 dist_feeds_DATA = $(wildcard feeds/*.feed)
 
+pluginsdir = $(applet_datadir)/feed/plugins
+dist_plugins_DATA = $(wildcard feed/plugins/*.py)
+
 uidir = $(applet_datadir)/ui
 dist_ui_DATA = \
 	$(wildcard ui/*.svg) \
 
=== modified file 'applets/maintained/comics/comics.py'
--- applets/maintained/comics/comics.py	2010-09-10 01:21:59 +0000
+++ applets/maintained/comics/comics.py	2011-01-09 09:07:16 +0000
@@ -27,7 +27,7 @@
 import os
 import sys
 import tempfile
-from awn.extras import _
+from awn.extras import _, awnlib
 
 # Import Comics! modules, but check dependencies first
 awn.check_dependencies(globals(), 'feedparser', 'pynotify')
@@ -35,6 +35,7 @@
 
 import comics_manage
 import comics_view
+from comics_add import ComicsAdder
 from feed.settings import Settings
 from feed import FeedContainer
 from shared import (
@@ -42,6 +43,8 @@
     USER_DIR, USER_FEEDS_DIR)
 
 APPLET_NAME = 'comics'
+applet_display_name = _('Comics!')
+applet_icon = os.path.join(ICONS_DIR, 'comics-icon.svg')
 
 
 class BidirectionalIterator:
@@ -79,6 +82,38 @@
         return self.sequence[self.index]
 
 
+class about_dialog(gtk.AboutDialog):
+    def __init__(self):
+        super(about_dialog, self).__init__()
+        pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(applet_icon, 48, 48)
+        self.set_name(applet_display_name)
+        self.set_copyright('Copyright \xc2\xa9 2008 Moses Palmér')
+        self.set_authors(['Moses Palmér',
+                         'Sharkbaitbobby',
+                         'Mark Lee',
+                         'Kyle L. Huff',
+                         'Gabor Karsay'])
+        self.set_artists(['Moses Palmér'])
+        self.set_comments(_("View your favourite comics on your desktop"))
+        self.set_license("This program is free software; you can " + \
+            "redistribute it and/or modify it under the terms of the GNU " + \
+            "General Public License as published by the Free Software " + \
+            "Foundation; either version 2 of the License, or (at your " + \
+            "option) any later version.\n\n" + \
+            "This program is distributed in the hope that it will be " + \
+            "useful, but WITHOUT ANY WARRANTY; without even the implied " + \
+            "warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR " + \
+            "PURPOSE.    See the GNU General Public License for more " + \
+            "details.\n\nYou should have received a copy of the GNU " + \
+            "General Public License along with this program; if not, " + \
+            "write to the Free Software Foundation, Inc., 51 Franklin St, " + \
+            "Fifth Floor, Boston, MA 02110-1301, USA.")
+        self.set_wrap_license(True)
+        self.set_logo(pixbuf)
+        self.set_icon_from_file(applet_icon)
+        self.set_version(awn.extras.__version__)
+
+
 class ComicApplet(awn.AppletSimple):
     DIALOG_DURATION = 3000
 
@@ -135,30 +170,19 @@
             self.create_window(template=template)
 
     def make_menu(self):
-        """Generate the menu listing the comics."""
+        """Generate the context menu."""
         # Generate comics menu
         menu = self.create_default_menu()
-        feed_menu = gtk.Menu()
-        for feed in self.feeds.feeds:
-            label = gtk.Label()
-            label.set_markup(self.feeds.feeds[feed].name)
-            align = gtk.Alignment(xalign=0.0)
-            align.add(label)
-            menu_item = gtk.CheckMenuItem()
-            menu_item.data = feed
-            menu_item.add(align)
-            menu_item.set_active(len([w for w in self.windows
-                                      if w.feed_name == feed]) > 0)
-            menu_item.connect('toggled', self.on_comics_toggled)
-            feed_menu.append(menu_item)
-        feed_menu.show_all()
-        container = gtk.MenuItem(_('Comics'))
-        container.set_sensitive(len(self.feeds.feeds) > 0)
-        container.set_submenu(feed_menu)
-        menu.append(container)
-        manage_item = gtk.MenuItem(_('Manage Comics'))
+        manage_item = gtk.MenuItem(_('My Comics'))
         manage_item.connect("activate", self.on_manage_comics_activated)
         menu.append(manage_item)
+        about_item = gtk.ImageMenuItem(_("_About %s") % applet_display_name)
+        if awnlib.is_required_version(gtk.gtk_version, (2, 16, 0)):
+            about_item.props.always_show_image = True
+        about_item.set_image(gtk.image_new_from_stock(gtk.STOCK_ABOUT,
+                                                      gtk.ICON_SIZE_MENU))
+        menu.append(about_item)
+        about_item.connect("activate", self.on_show_about_activated)
         menu.show_all()
         return menu
 
@@ -176,7 +200,7 @@
 
         self.set_icon_name('comics-icon')
         # Initialise notifications
-        notify_init(_('Comics!'))
+        notify_init(applet_display_name)
         self.dialog = awn.Dialog(self)
         self.dialog.connect('button-release-event',
                             self.on_dialog_button_press)
@@ -197,6 +221,9 @@
         self.windows = []
         self.window_iterator = BidirectionalIterator(self.windows)
         self.current_window = None
+        self.manager = None
+        self.adder = None
+        self.about = None
 
         try:
             for filename in (f for f in os.listdir(STRIPS_DIR)
@@ -209,24 +236,35 @@
 
     def on_window_updated(self, widget, title):
         msg = Notification(_('There is a new strip of %s!') % widget.feed_name,
-                           None,
-                           os.path.join(ICONS_DIR, 'comics-icon.svg'))
+                           None, applet_icon)
         msg.show()
 
     def on_window_removed(self, widget):
         self.windows.remove(widget)
+        if self.manager:
+            if self.manager.on_screen():
+                self.manager.load_feeds()
 
     def on_destroy(self, widget):
         for window in self.windows:
             window.save_settings()
 
     def on_button1_pressed(self, event):
-        self.set_visibility(not self.visible)
+        if len(self.feeds.feeds) == 0:
+            if self.adder and self.adder.on_screen():
+                self.adder.present()
+            else:
+                self.adder = []
+                self.adder = ComicsAdder(self)
+        elif not self.windows:
+            self.on_manage_comics_activated(None)
+        else:
+            self.set_visibility(not self.visible)
 
     def on_button3_pressed(self, event):
         menu = self.make_menu()
         if menu:
-            self.popup_gtk_menu (menu, event.button, event.time)
+            self.popup_gtk_menu(menu, event.button, event.time)
 
     def on_button_press(self, widget, event):
         if event.button == 1:
@@ -255,9 +293,21 @@
         self.toggle_feed(widget.data, widget.get_active())
 
     def on_manage_comics_activated(self, widget):
-        manager = comics_manage.ComicsManager(self.feeds)
-        manager.show()
+        if self.manager and self.manager.on_screen():
+            self.manager.present()
+        else:
+            self.manager = []
+            self.manager = comics_manage.ComicsManager(self)
+            self.manager.show()
 
+    def on_show_about_activated(self, widget):
+        if self.about and len(self.about) != 0:
+            self.about.present()
+        else:
+            self.about = []
+            self.about = about_dialog()
+            self.about.run()
+            self.about.destroy()
 
 if __name__ == '__main__':
     # Initialise threading
@@ -274,14 +324,12 @@
 
     # Load the feeds
     feeds = FeedContainer()
-    feeds.load_directory(SYS_FEEDS_DIR)
     feeds.load_directory(USER_FEEDS_DIR)
 
     #Initialise AWN and create the applet
     awn.init(sys.argv[1:])
     applet = ComicApplet(awn.uid, awn.panel_id, feeds)
 
-
     # Initialize user agent string
     import urllib
 
 
=== modified file 'applets/maintained/comics/comics_add.py'
--- applets/maintained/comics/comics_add.py	2010-03-01 06:50:28 +0000
+++ applets/maintained/comics/comics_add.py	2011-01-09 09:07:16 +0000
@@ -17,6 +17,7 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
+from __future__ import with_statement
 
 # Libraries used
 import gobject
@@ -30,10 +31,11 @@
 
 # Local
 from downloader import Downloader
-from feed.basic import Feed, NAME, URL
+from feed import FeedContainer
+from feed.basic import Feed, NAME, URL, PLUGIN
 from feed.settings import Settings
 from feed.rss import IMG_INDEX
-from shared import (UI_DIR, USER_FEEDS_DIR)
+from shared import (UI_DIR, USER_FEEDS_DIR, SYS_FEEDS_DIR)
 
 UI_FILE = os.path.join(UI_DIR, 'add.ui')
 
@@ -67,13 +69,30 @@
 
         return True
 
+    def load_sys_list(self):
+        if not self.sys:
+            self.sys = FeedContainer()
+            self.sys.load_directory(SYS_FEEDS_DIR)
+        self.sys_model.clear()
+        names = self.sys.feeds.keys()
+        names.sort(key=str.lower)
+        for feed in names:
+            self.sys_model.append((feed, self.sys.feeds[feed].filename))
+
+    def on_screen(self):
+        return len(self.assistant) != 0
+
+    def present(self):
+        self.assistant.present()
+
     ########################################################################
     # Standard python methods                                              #
     ########################################################################
 
-    def __init__(self, feeds):
+    def __init__(self, parent):
         """Create a new ComicsAdder instance."""
-        self.feeds = feeds
+        self.__parent = parent
+        self.feeds = parent.feeds
         self.name = ''
         self.url = ''
         self.feed = None
@@ -86,9 +105,24 @@
         self.assistant = self.ui.get_object('add_assistant')
         self.image_list = self.ui.get_object('image_list')
 
+        self.sys = None
+        self.sys_list = self.ui.get_object('pre_list')
+        self.sys_model = gtk.ListStore(gobject.TYPE_STRING,
+                                       gobject.TYPE_STRING)
+        self.sys_col = self.ui.get_object('pre_col')
+        self.load_sys_list()
+        self.sys_list.set_model(self.sys_model)
+
+        self.from_list = True
+        self.radio_button = self.ui.get_object('list_radio')
+        self.radio_button.set_active(self.from_list)
+
         self.model = gtk.ListStore(gobject.TYPE_PYOBJECT, gtk.gdk.Pixbuf)
         self.image_list.set_model(self.model)
 
+        selection = self.sys_list.get_selection()
+        selection.connect('changed', self.on_list_selection_changed)
+        selection.set_mode(gtk.SELECTION_MULTIPLE)
         # Show window
         self.assistant.set_page_complete(self.ui.get_object('intro_page'),
             True)
@@ -115,39 +149,113 @@
             os.mkdir(USER_FEEDS_DIR)
         except Exception:
             pass
-        f, filename = tempfile.mkstemp('.feed', '', USER_FEEDS_DIR, True)
-        os.close(f)
-        settings = Settings(filename)
-        settings.description = 'Automatically generated by comics'
-        settings[NAME] = self.name
-        settings[URL] = self.url
-        settings[IMG_INDEX] = self.image[0] + 1
-        settings.comments[IMG_INDEX] = \
-            'The index of the image in the HTML-code'
 
-        settings.save()
-        self.feeds.add_feed(filename)
+        if self.from_list:
+            model, paths = self.sys_list.get_selection().get_selected_rows()
+            for path in paths:
+                self.name = model.get_value(model.get_iter(path), 0)
+                src = model.get_value(model.get_iter(path), 1)
+                filename = USER_FEEDS_DIR + src[len(SYS_FEEDS_DIR):]
+                with open(src, 'r') as fp:
+                    src_content = fp.read()
+                try:
+                    with open(filename, 'r') as fp:
+                        f = fp.read()
+                except IOError:
+                    f = None
+                if f:
+                    if cmp(src_content, f) == 0:
+                        continue
+                    msg = _("Overwrite comic \"%s\"?") % self.name
+                    sec = _(
+                 "This comic is already installed with different settings.")
+                    dialog = gtk.MessageDialog(parent=self.assistant,
+                                   flags=gtk.DIALOG_DESTROY_WITH_PARENT,
+                                   type=gtk.MESSAGE_WARNING,
+                                   message_format=msg)
+                    dialog.format_secondary_markup(sec)
+                    if path != paths[-1]:
+                        dialog.add_buttons(
+                                       gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
+                    dialog.add_buttons(gtk.STOCK_NO, gtk.RESPONSE_NO,
+                                       gtk.STOCK_YES, gtk.RESPONSE_YES)
+                    response = dialog.run()
+                    dialog.destroy()
+                    if response == gtk.RESPONSE_NO:
+                        continue
+                    if response != gtk.RESPONSE_YES:
+                        return
+                with open(filename, 'w') as fp:
+                    fp.write(src_content)
+                self.feeds.add_feed(filename)
+                self.feeds.update()
+                self.__parent.toggle_feed(self.name, True)
+        else:
+            self.name = self.ui.get_object('name_entry').get_text()
+            f, filename = tempfile.mkstemp('.feed', '', USER_FEEDS_DIR, True)
+            os.close(f)
+            settings = Settings(filename)
+            settings.description = 'Automatically generated by comics'
+            settings[NAME] = self.name
+            settings[URL] = self.url
+            settings[IMG_INDEX] = self.image[0] + 1
+            settings.comments[IMG_INDEX] = \
+                'The index of the image in the HTML-code'
+            if self.feed.__module__.startswith('feed.plugins.'):
+                settings[PLUGIN] = self.feed.__module__[13:]
+            settings.save()
+            self.feeds.add_feed(filename)
+            self.feeds.update()
+            self.__parent.toggle_feed(self.name, True)
 
     def on_add_assistant_prepare(self, widget, page):
         if page is self.ui.get_object('url_page'):
-            self.ui.get_object('wait_page').show()
+            if self.from_list:
+                self.ui.get_object('list_box').show()
+                self.ui.get_object('url_box').hide()
+            else:
+                self.ui.get_object('list_box').hide()
+                self.ui.get_object('url_box').show()
 
         elif page is self.ui.get_object('wait_page'):
-            self.assistant.set_page_complete(page, False)
-            self.url = self.ui.get_object('url_entry').get_text()
-
-            self.ui.get_object('wait_label').set_markup(
-                _('Connecting to <i>%s</i>...') % self.url)
-
-            # Download feed
-            self.feed = self.feeds.get_feed_for_url(self.url)
-            self.__update = self.feed.connect('updated', self.on_feed_updated)
-            self.feed.update()
+            if self.from_list:
+                self.ui.get_object('name_box').hide()
+                last_label = self.ui.get_object('last_label')
+                last_label.set_markup(_('''\
+This guide has finished.\n\
+Press "apply" to add the comic.'''))
+                self.assistant.set_current_page(4)
+            else:
+                self.assistant.set_page_complete(page, False)
+                self.url = self.ui.get_object('url_entry').get_text()
+
+                self.ui.get_object('wait_label').set_markup(
+                    _('Connecting to <i>%s</i>...') % self.url)
+
+                # Download feed
+                self.feed = self.feeds.get_feed_for_url(self.url)
+                self.__update = self.feed.connect('updated',
+                                                  self.on_feed_updated)
+                self.feed.update()
+
+    def on_radio_button_toggled(self, widget):
+        self.from_list = self.radio_button.get_active()
 
     def on_url_entry_changed(self, widget):
         text = widget.get_text()
-        self.assistant.set_page_complete(self.ui.get_object('url_page'),
-            not URL_RE.match(text) is None)
+        if not self.from_list:
+            self.assistant.set_page_complete(self.ui.get_object('url_page'),
+                not URL_RE.match(text) is None)
+
+    def on_list_selection_changed(self, widget):
+        if self.from_list:
+            self.assistant.set_page_complete(self.ui.get_object('url_page'),
+                self.sys_list.get_selection().count_selected_rows() > 0)
+
+    def on_name_entry_changed(self, widget):
+        text = widget.get_text()
+        self.assistant.set_page_complete(self.ui.get_object('last_page'),
+            not text == '')
 
     def on_image_list_unselect_all(self, widget):
         self.assistant.set_page_complete(self.ui.get_object('image_page'),
@@ -172,8 +280,10 @@
 
         last_label = self.ui.get_object('last_label')
         last_label.set_markup(_('''\
-This guide has finished.\n\nPress "apply" to add <i>%s</i>.''') \
-                              % self.name)
+This guide has finished.\n\
+You can change the name of this comic. Press "apply" to add it.'''))
+        name_entry = self.ui.get_object('name_entry')
+        name_entry.set_text(self.name)
 
         # Can we skip the image page?
         images = feed.get_unique_images()
@@ -189,7 +299,11 @@
             self.ui.get_object('image_page').show()
         else:
             self.ui.get_object('image_page').hide()
-            self.image = images[0]
+            try:
+                self.image = images[0]
+            except IndexError:
+                self.process_error(Feed.DOWNLOAD_NOT_FEED)
+                return
 
         # Complete page
         self.assistant.set_page_complete(self.ui.get_object('wait_page'),
@@ -204,7 +318,9 @@
         if code != Downloader.OK:
             self.model.remove(iterator)
         else:
-            pixbuf = gtk.gdk.pixbuf_new_from_file(o.filename)
+            try:
+                pixbuf = gtk.gdk.pixbuf_new_from_file(o.filename)
+                self.model.set_value(iterator, 1, pixbuf)
+            except Exception:
+                self.model.remove(iterator)
             os.remove(o.filename)
-
-            self.model.set_value(iterator, 1, pixbuf)
 
=== modified file 'applets/maintained/comics/comics_manage.py'
--- applets/maintained/comics/comics_manage.py	2010-03-01 06:50:28 +0000
+++ applets/maintained/comics/comics_manage.py	2011-01-09 09:07:16 +0000
@@ -24,6 +24,7 @@
 import os
 
 # Symbols used
+from gettext import ngettext
 from awn.extras import _
 
 # Local
@@ -47,86 +48,127 @@
     def load_feeds(self):
         """Load the descriptions of all installed feeds."""
         self.model.clear()
-
-        shared_iterator = self.model.append(None, (_('Shared comics'), ''))
-        user_iterator = self.model.append(None, (_('Your comics'), ''))
-        for feed_name, feed in self.feeds.feeds.items():
-            if os.access(os.path.dirname(feed.filename), os.W_OK):
-                self.model.append(user_iterator, (feed_name, feed.filename))
-            else:
-                self.model.append(shared_iterator, (feed_name, feed.filename))
-
-        self.comics_list.expand_all()
+        names = self.feeds.feeds.keys()
+        names.sort(key=str.lower)
+        for feed in names:
+            self.model.append(
+                (len([w for w in self.__parent.windows
+                    if w.feed_name == feed]) > 0,
+                feed, self.feeds.feeds[feed].filename))
 
     def show(self):
         self.manage_window.show()
 
+    def present(self):
+        self.manage_window.present()
+
+    def on_screen(self):
+        return len(self.manage_window) != 0
+
     ########################################################################
     # Standard python methods                                              #
     ########################################################################
 
-    def __init__(self, feeds):
+    def __init__(self, parent):
         """Create a new ComicsManage instance."""
         # Connect dialogue events
         self.ui = gtk.Builder()
         self.ui.add_from_file(UI_FILE)
         self.ui.connect_signals(self)
 
-        self.feeds = feeds
+        self.__parent = parent
+        self.feeds = parent.feeds
 
         self.manage_window = self.ui.get_object('manage_window')
 
-        self.model = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
+        self.model = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING,
+                                   gobject.TYPE_STRING)
 
         self.comics_list = self.ui.get_object('comics_list')
         selection = self.comics_list.get_selection()
         selection.connect('changed', self.on_comics_list_selection_changed)
-        cr = gtk.CellRendererText()
-        column = gtk.TreeViewColumn()
-        column.pack_start(cr)
-        column.set_attributes(cr, text=0)
-        self.comics_list.append_column(column)
+        selection.set_mode(gtk.SELECTION_MULTIPLE)
         self.comics_list.set_model(self.model)
+        # Translators: checkbox to show comic
+        self.ui.get_object('toggle_col').set_title(_('Show'))
+        self.ui.get_object('name_col').set_title(_('Comic'))
 
         self.load_feeds()
+        x, y = self.comics_list.size_request()
+        if x > 475:
+            x = 475
+        if y > 400:
+            y = 400
+        self.manage_window.set_default_size(x + 25, y + 100)
 
     ########################################################################
     # Event hooks                                                          #
     ########################################################################
 
     def on_comics_list_selection_changed(self, widget):
-        model, iterator = self.comics_list.get_selection().get_selected()
+        rows = self.comics_list.get_selection().count_selected_rows()
         button = self.ui.get_object('remove_button')
-        if iterator:
-            directory = os.path.dirname(self.model.get_value(iterator, 1))
-            button.set_sensitive(os.access(directory, os.W_OK))
+        button.set_sensitive(rows > 0)
+
+    def on_feed_toggled(self, widget, path):
+        self.model[path][0] = not self.model[path][0]
+        self.__parent.toggle_feed(self.model[path][1], self.model[path][0])
+
+    def on_add_button_clicked(self, widget):
+        if self.__parent.adder and self.__parent.adder.on_screen():
+            self.__parent.adder.present()
         else:
-            button.set_sensitive(False)
-
-    def on_add_button_clicked(self, widget):
-        adder = ComicsAdder(self.feeds)
-        adder.assistant.set_transient_for(self.manage_window)
-        adder.assistant.connect('destroy', self.on_adder_destroy)
+            self.__parent.adder = []
+            self.__parent.adder = ComicsAdder(self.__parent)
+            self.__parent.adder.assistant.set_transient_for(self.manage_window)
+            self.__parent.adder.assistant.connect('destroy',
+                self.on_adder_destroy)
 
     def on_remove_button_clicked(self, widget):
-        model, iterator = self.comics_list.get_selection().get_selected()
-        feed_name = self.model.get_value(iterator, 0)
-        filename = self.model.get_value(iterator, 1)
-        try:
-            self.feeds.remove_feed(feed_name)
-            os.remove(filename)
-        except Exception:
-            msg = _('Failed to remove <i>%s</i>.') % filename
-            dialog = gtk.MessageDialog(parent=self.manage_window,
-                                       flags=gtk.DIALOG_DESTROY_WITH_PARENT,
-                                       type=gtk.MESSAGE_INFO,
-                                       buttons=gtk.BUTTONS_CLOSE,
-                                       message_format=msg)
-            dialog.set_title(_('Error'))
-            dialog.run()
-            dialog.hide()
-            del dialog
+        model, path = self.comics_list.get_selection().get_selected_rows()
+        msg = ngettext(
+            "Are you sure you want to remove the comic \"%(name)s\"?",
+            "Are you sure you want to remove the %(number)d selected comics?",
+            len(path)) % {'number': len(path),
+            'name': self.model.get_value(self.model.get_iter(path[0]), 1)}
+        sec = ngettext(
+            "This will remove the comic from your personal comics list.",
+            "This will remove these comics from your personal comics list.",
+            len(path))
+
+        dialog = gtk.MessageDialog(parent=self.manage_window,
+                                   flags=gtk.DIALOG_DESTROY_WITH_PARENT,
+                                   type=gtk.MESSAGE_WARNING,
+                                   message_format=msg)
+        dialog.format_secondary_markup(sec)
+        dialog.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                           gtk.STOCK_REMOVE, gtk.RESPONSE_OK)
+        response = dialog.run()
+        dialog.destroy()
+
+        if response != gtk.RESPONSE_OK:
             return
+
+        def remove(model, path, iterator):
+            feed_name = model.get_value(iterator, 1)
+            filename = model.get_value(iterator, 2)
+            self.__parent.toggle_feed(feed_name, False)
+            try:
+                self.feeds.remove_feed(feed_name)
+                os.remove(filename)
+            except Exception:
+                msg = _("Failed to remove '%s'.") % filename
+                dialog = gtk.MessageDialog(parent=self.manage_window,
+                                          flags=gtk.DIALOG_DESTROY_WITH_PARENT,
+                                          type=gtk.MESSAGE_INFO,
+                                          buttons=gtk.BUTTONS_CLOSE,
+                                          message_format=msg)
+                dialog.set_title(_('Error'))
+                dialog.run()
+                dialog.destroy()
+                return
+
+        self.comics_list.get_selection().selected_foreach(remove)
         self.load_feeds()
 
     def on_close_button_clicked(self, widget):
 
=== modified file 'applets/maintained/comics/comics_view.py'
--- applets/maintained/comics/comics_view.py	2010-03-01 06:50:28 +0000
+++ applets/maintained/comics/comics_view.py	2011-01-09 09:07:16 +0000
@@ -42,7 +42,6 @@
 
 STRIPS_DIR = USER_DIR
 CACHE_FILE = os.path.join(USER_DIR, '%s.cache')
-UI_FILE = os.path.join(UI_DIR, 'view.ui')
 
 BROWSER_COMMAND = 'xdg-open'
 
@@ -123,11 +122,13 @@
             screen = self.get_screen()
             screen_width, screen_height = (screen.get_width(),
                 screen.get_height())
+            w, h = self.get_size()
+            x = self.__settings.get_int('x', (screen_width - w) / 2)
+            y = self.__settings.get_int('y', (screen_height - h) / 2)
 
             # Show the window first...
             self.show()
 
-            x, y = self.get_position()
             x %= screen_width
             if x < 0:
                 x += screen_width
@@ -135,32 +136,34 @@
             if y < 0:
                 y += screen_height
 
+            # this must be between self.show() and self.move()
+            # it calls self.get_position(), without it the comic
+            # will not be painted the very first time
+            self.save_settings()
+
             # ...and then move it
             self.move(x, y)
 
-            self.__settings['x'] = x
-            self.__settings['y'] = y
-
             if has_widget_layer():
                 compiz_widget_set(self, False)
         else:
+            if self.get_window():
+                self.save_settings()
             if has_widget_layer():
                 self.show()
                 compiz_widget_set(self, True)
             else:
                 self.hide()
 
-        self.__settings.save()
-
     def close(self):
-        self.emit('removed')
-        self.__settings.delete()
         self.destroy()
 
     def get_menu_item_name(self, item):
         """Return the menu item name of item."""
         if item[DATE] > 0:
             tt = time.localtime(item[DATE])
+            # Translators: This is a date/time format string. You can check the
+            # output in terminal with 'date +"%%A %d %B"'.
             return time.strftime(_('%A %d %B'), tt)
         else:
             return item[TITLE]
@@ -335,49 +338,64 @@
 
         ctx.restore()
 
-    def make_file_type_chooser(self):
-        """Add the possible image types to the file chooser dialog."""
-        combo = self.__ui.get_object('file_format_combo')
-        model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING,
-            gobject.TYPE_STRING)
-        for format in gdk.pixbuf_get_formats():
-            if format['is_writable']:
-                text = '%s (*.%s)' % (format['description'],
-                    format['extensions'][0])
-                model.append((format['description'], format['name'],
-                    format['extensions'][0]))
-        combo.set_model(model)
-        combo.set_active(0)
-
     def make_menu(self):
         """Create the context menu."""
+        menu = gtk.Menu()
+
         # Generate history menu
-        history_menu = self.__ui.get_object('history_menu')
-        history_menu.foreach(lambda child: history_menu.remove(child))
-        items = self.feeds.feeds[self.feed_name].items.items()
-        items.sort(reverse=True)
-        for date, item in items:
-            label = gtk.Label()
-            text = self.get_menu_item_name(item)
-            if self.__current_timestamp == date:
-                label.set_markup('<b>' + text + '</b>')
-            else:
-                label.set_markup(text)
-            align = gtk.Alignment(xalign=0.0)
-            align.add(label)
-            menu_item = gtk.MenuItem()
-            menu_item.data = item
-            menu_item.connect('activate', self.on_history_activated)
-            menu_item.add(align)
-            history_menu.append(menu_item)
-        history_menu.show_all()
-        self.__ui.get_object('show_link_item').set_active(self.show_link)
-        self.__ui.get_object('history_container').set_sensitive(
-            len(self.feeds.feeds[self.feed_name].items) > 0)
-        self.__ui.get_object('save_as_item').set_sensitive(not self.__pixbuf \
-            is None)
-
-        return self.__ui.get_object('menu')
+        if len(self.feeds.feeds[self.feed_name].items) > 1:
+            history_container = gtk.ImageMenuItem(gtk.STOCK_JUMP_TO)
+            history_menu = gtk.Menu()
+            history_menu.foreach(lambda child: history_menu.remove(child))
+            items = self.feeds.feeds[self.feed_name].items.items()
+            items.sort(reverse=True)
+            for date, item in items:
+                label = gtk.Label()
+                text = self.get_menu_item_name(item)
+                if self.__current_timestamp == date:
+                    label.set_markup('<b>' + text + '</b>')
+                else:
+                    label.set_markup(text)
+                align = gtk.Alignment(xalign=0.0)
+                align.add(label)
+                menu_item = gtk.MenuItem()
+                menu_item.data = item
+                menu_item.connect('activate', self.on_history_activated)
+                menu_item.add(align)
+                history_menu.append(menu_item)
+            history_container.set_submenu(history_menu)
+            menu.append(history_container)
+
+        size_container = gtk.MenuItem(_("Size"))
+        size_menu = gtk.Menu()
+        zoom_normal_item = gtk.ImageMenuItem(gtk.STOCK_ZOOM_100)
+        zoom_normal_item.connect('activate', self.on_normal_activated)
+        zoom_in_item = gtk.ImageMenuItem(gtk.STOCK_ZOOM_IN)
+        zoom_in_item.connect('activate', self.on_larger_activated)
+        zoom_out_item = gtk.ImageMenuItem(gtk.STOCK_ZOOM_OUT)
+        zoom_out_item.connect('activate', self.on_smaller_activated)
+        size_menu.append(zoom_normal_item)
+        size_menu.append(zoom_in_item)
+        size_menu.append(zoom_out_item)
+        size_container.set_submenu(size_menu)
+        menu.append(size_container)
+
+        show_link_item = gtk.CheckMenuItem(_("Show link"))
+        show_link_item.set_active(self.show_link)
+        show_link_item.connect('toggled', self.on_show_link_toggled)
+        menu.append(show_link_item)
+
+        save_as_item = gtk.ImageMenuItem(stock_id='gtk-save-as')
+        save_as_item.set_sensitive(not self.__pixbuf is None)
+        save_as_item.connect('activate', self.on_save_as_activated)
+        menu.append(save_as_item)
+
+        close_item = gtk.ImageMenuItem(stock_id='gtk-close')
+        close_item.connect('activate', self.on_close_activated)
+        menu.append(close_item)
+
+        menu.show_all()
+        return menu
 
     ########################################################################
     # Standard python methods                                              #
@@ -399,9 +417,6 @@
         except Exception:
             self.__pixbuf = None
         self.__is_error = False
-        self.__ui = gtk.Builder()
-        self.__ui.add_from_file(UI_FILE)
-        self.make_file_type_chooser()
         self.__link = WWWLink('', '', LINK_FONTSIZE)
         self.__link.connect('size-allocate', self.on_link_size_allocate)
         self.__ticker = Ticker((20.0, 20.0))
@@ -412,7 +427,6 @@
         # Connect events
         self.connect('destroy', self.on_destroy)
         self.feeds.connect('feed-changed', self.on_feed_changed)
-        self.__ui.connect_signals(self)
 
         # Build UI
         self.__link.connect('button-press-event', self.on_link_clicked)
@@ -422,9 +436,10 @@
 
         self.set_skip_taskbar_hint(True)
         self.set_skip_pager_hint(True)
-        self.set_visibility(visible)
 
         self.load_settings()
+        if visible:
+            self.set_visibility(visible)
 
     ########################################################################
     # Property updating methods                                            #
@@ -432,14 +447,9 @@
 
     def load_settings(self):
         """Load the settings."""
-        screen = self.get_screen()
-        w, h = self.get_size()
-
         self.set_show_link(self.__settings.get_bool('show_link',
             False))
         self.set_feed_name(self.__settings.get_string('feed_name', ''))
-        self.move(self.__settings.get_int('x', (screen.get_width() - w) / 2),
-            self.__settings.get_int('y', (screen.get_height() - h) / 2))
 
     def save_settings(self):
         """Save the settings."""
@@ -484,6 +494,8 @@
     ########################################################################
 
     def on_destroy(self, widget):
+        self.emit('removed')
+        self.__settings.delete()
         if self.__update_id:
             self.feeds.feeds[self.feed_name].disconnect(self.__update_id)
             self.__update_id = None
@@ -516,33 +528,55 @@
         self.close()
 
     def on_save_as_activated(self, widget):
-        dialog = self.__ui.get_object('save_as_dialog')
-        dialog.set_title(self.feed_name)
-        combo = self.__ui.get_object('file_format_combo')
-        model, iterator = combo.get_model(), combo.get_active_iter()
-        format = model.get_value(iterator, 1)
-        ext = model.get_value(iterator, 2)
-        dialog.set_current_name('%s.%s' % (self.__link.text, ext))
-        if dialog.run():
-            model, iterator = combo.get_model(), combo.get_active_iter()
-            format = model.get_value(iterator, 1)
+        """Run FileChooserDialog and save file."""
+        self.dialog = gtk.FileChooserDialog(_("Save comic as…"), \
+                      buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, \
+                               gtk.STOCK_SAVE, gtk.RESPONSE_OK), \
+                      action=gtk.FILE_CHOOSER_ACTION_SAVE)
+        self.dialog.set_icon_from_file(os.path.join(UI_DIR, 'comics.svg'))
+        self.dialog.set_do_overwrite_confirmation(True)
+        self.dialog.set_current_name(self.__link.text + '.jpg')
+
+        # Set filters, default jpg, without ico
+        for format in gdk.pixbuf_get_formats():
+            if format['is_writable'] and format['name'] != 'ico':
+                ff = gtk.FileFilter()
+                ff.set_name(format['description'])
+                for i in format['mime_types']:
+                    ff.add_mime_type(i)
+                self.dialog.add_filter(ff)
+                if format['name'] == 'jpeg':
+                    self.dialog.set_filter(ff)
+        self.dialog.connect('notify::filter', self.on_filter_changed)
+
+        if self.dialog.run() == gtk.RESPONSE_OK:
+            ff = gtk.FileFilter()
+            ff = self.dialog.get_filter()
+            name = ff.get_name()
+            for format in gdk.pixbuf_get_formats():
+                if format['description'] == name:
+                    name = format['name']
+                    break
             try:
-                self.__pixbuf.save(dialog.get_filename(), format)
+                self.__pixbuf.save(self.dialog.get_filename(), name)
             except Exception:
                 self.applet.show_message(_('Failed to save <i>%s</i>.') %
-                    dialog.get_filename(), gtk.STOCK_DIALOG_ERROR)
-
-        dialog.hide()
-
-    def on_file_format_combo_changed(self, widget):
-        dialog = self.__ui.get_object('save_as_dialog')
-        current_name = dialog.get_filename().rsplit('.', 1)
+                    self.dialog.get_filename(), gtk.STOCK_DIALOG_ERROR)
+        self.dialog.destroy()
+
+    def on_filter_changed(self, pspec, data):
+        """Change filename extension."""
+        current_name = self.dialog.get_filename().rsplit('.', 1)
         if len(current_name) == 2:
-            combo = widget
-            model, iterator = combo.get_model(), combo.get_active_iter()
-            ext = model.get_value(iterator, 2)
-            dialog.set_current_name('%s.%s' % (
-                os.path.basename(current_name[0]), ext))
+            ff = gtk.FileFilter()
+            ff = self.dialog.get_filter()
+            for i in gdk.pixbuf_get_formats():
+                if i['description'] == ff.get_name():
+                    for ext in i['extensions']:
+                        if current_name[1] == ext:
+                            return
+                    self.dialog.set_current_name('%s.%s' % (
+                        os.path.basename(current_name[0]), i['extensions'][0]))
 
     def on_link_size_allocate(self, widget, e):
         i_dim = self.get_image_dimensions()
@@ -578,7 +612,8 @@
             # Only emit the updated signal when there actually is an update
             if self.__current_timestamp != 0.0:
                 self.emit('updated', feed.items[feed.newest][TITLE])
-            self.select_item(feed.items[feed.newest])
+            if feed.newest in feed.items:
+                self.select_item(feed.items[feed.newest])
 
     def on_download_completed(self, o, code, item):
         """A new image has been downloaded."""
@@ -593,7 +628,11 @@
         self.__download_id = None
 
         if not self.__is_error:
-            del self.__pixbuf
+            try:
+                del self.__pixbuf
+            except AttributeError:
+                # Received destroy signal after download was initiated
+                return
             try:
                 self.__pixbuf = gdk.pixbuf_new_from_file(o.filename)
             except gobject.GError:
 
=== modified file 'applets/maintained/comics/feed/__init__.py'
--- applets/maintained/comics/feed/__init__.py	2010-01-04 07:37:45 +0000
+++ applets/maintained/comics/feed/__init__.py	2011-01-09 09:07:16 +0000
@@ -40,14 +40,14 @@
         of factories. If filename does not contain a feed factory, it is not
         added."""
         try:
-            module = __import__('plugins.%s' % name, fromlist=[name])
+            module = __import__('plugins.%s' % name, globals(), locals(), [name], -1)
             if hasattr(module, 'matches_url') and hasattr(module, 'get_class'):
-                self.feed_factories.append(module)
+                self.feed_factories[name] = module
                 return True
             else:
                 del module
-        except Exception:
-            pass
+        except Exception, err:
+            print "Comics!: Error loading plugin: %s" % err
 
         return False
 
@@ -75,14 +75,15 @@
                     if plugin in self.feed_factories:
                         factory = self.feed_factories[plugin].get_class()
                     else:
+                        print "Comics!: Plugin '%s' not found" % plugin
                         return False
                 else:
                     factory = RSSFeed
                 feed = factory(settings)
                 self.feeds[settings[NAME]] = feed
                 self.emit('feed-changed', feed, FeedContainer.FEED_ADDED)
-            except Exception:
-                pass
+            except Exception, err:
+                print "Comics!: Error loading feed: %s" % err
 
         return False
 
@@ -90,8 +91,8 @@
         """Creates a feed suitable for a given URL. If no plugin matches the
         URL, an RSSFeed is returned."""
         for factory in self.feed_factories:
-            if factory.matches_url(url):
-                return factory.get_class()(url=url)
+            if self.feed_factories[factory].matches_url(url):
+                return self.feed_factories[factory].get_class()(url=url)
         return RSSFeed(url=url)
 
     def remove_feed(self, feed_name):
 
=== modified file 'applets/maintained/comics/feed/basic.py'
--- applets/maintained/comics/feed/basic.py	2010-01-04 07:36:10 +0000
+++ applets/maintained/comics/feed/basic.py	2011-01-09 09:07:16 +0000
@@ -23,15 +23,23 @@
 import urllib
 import urlparse
 import threading
+import htmlentitydefs
+import httplib
+import time
 
 from settings import Settings
 
 NAME = 'name'
 URL = 'url'
+PLUGIN = 'plugin'
 TITLE = 'title'
 LINK = 'link'
 DATE = 'date'
 
+month = {'Jan': '01', 'Feb': '02', 'Mar': '03', 'Apr': '04',
+         'May': '05', 'Jun': '06', 'Jul': '07', 'Aug': '08',
+         'Sep': '09', 'Oct': '10', 'Nov': '11', 'Dec': '12'}
+
 
 class Feed(gobject.GObject):
     """A feed class."""
@@ -58,8 +66,83 @@
         elif parsed[0][2][0] == '/':
             return parsed[1][0] + '://' + parsed[1][1] + parsed[0][2]
         else:
+            # TODO this didn't work for some (or all?) urls,
+            # like http://www.gwscomic.com - test more thoroughly whether
+            # there should be an elif for that
+            #return parsed[1][0] + '://' + parsed[1][1] \
+            #    + parsed[1][2].rsplit('/', 1)[0] + parsed[0][2]
             return parsed[1][0] + '://' + parsed[1][1] \
-                + parsed[1][2].rsplit('/', 1)[0] + parsed[0][2]
+                + '/' + parsed[0][2]
+
+    def get_timestamp_for_url(self, url):
+        """Request the "Last-Modified" header from url without downloading
+        any data and return a timestamp or None"""
+        if url is None or len(url) == 0:
+            return None
+        p = urlparse.urlparse(url)
+        try:
+            if p.scheme == 'http':
+                conn = httplib.HTTPConnection(p.netloc)
+            elif p.scheme == 'https':
+                conn = httplib.HTTPSConnection(p.netloc)
+            else:
+                raise Exception
+            conn.request("HEAD", p.path)
+            res = conn.getresponse()
+            htime = res.getheader("Last-Modified")
+        except Exception:
+            return None
+
+        # Based on a posting by Philip Semanchuk, Nov 2009 on
+        # http://mail.python.org/mailman/listinfo/python-list
+
+        try:
+            if not htime.endswith("GMT"):
+                # ASCTIME format
+                # Work around locale problems: remove weedays,
+                # convert month names to decimals
+                htime = htime[4:]
+                htime = month[htime[0:3]] + htime[3:]
+                timestamp = time.strptime(htime, "%m %d %H:%M:%S %Y")
+            else:
+                # RFC 850 Format
+                if "-" in htime:
+                    htime = htime.split(" ", 1)[1]
+                    htime = htime[:3] + month[htime[3:6]] + htime[6:]
+                    timestamp = time.strptime(htime, "%d-%m-%y %H:%M:%S GMT")
+                else:
+                    # RFC 1123 Format
+                    htime = htime[5:]
+                    htime = htime[:3] + month[htime[3:6]] + htime[6:]
+                    timestamp = time.strptime(htime, "%d %m %Y %H:%M:%S GMT")
+            timestamp = time.mktime(timestamp)
+        except Exception, err:
+            print "Comics!: %s" % err
+            return None
+        return timestamp
+
+    def unescape_html(self, text):
+        """Taken from Fredrik Lundh -
+        http://effbot.org/zone/re-sub.htm#unescape-html"""
+        def fixup(m):
+            text = m.group(0)
+            if text[:2] == "&#":
+                # character reference
+                try:
+                    if text[:3] == "&#x":
+                        return unichr(int(text[3:-1], 16))
+                    else:
+                        return unichr(int(text[2:-1]))
+                except ValueError:
+                    pass
+            else:
+                # named entity
+                try:
+                    text = unichr(htmlentitydefs.name2codepoint[text[1:-1]])
+                except KeyError:
+                    pass
+            return text  # leave as is
+        return re.sub("&#?\w+;", fixup, text)
 
     def __init__(self, settings=None, url=None):
         """Initialize a feed."""
@@ -88,23 +171,21 @@
         """The thread body."""
         if not self.__lock.acquire(False):
             return
+        old_status = self.status
+        self.updated = False
         try:
-            old_status = self.status
-            try:
-                self.updated = False
-                filename, headers = urllib.urlretrieve(self.url)
-                self.status = self.parse_file(filename)
-            finally:
-                pass
-            #except Exception:
-            #    self.status = Feed.DOWNLOAD_FAILED
-
+            filename, headers = urllib.urlretrieve(self.url)
+            self.status = self.parse_file(filename)
             # If the status has changed, the feed is considered updated
             if self.updated or old_status != self.status:
                 gobject.idle_add(gobject.GObject.emit, self, 'updated',
                     self.status)
-        finally:
-            self.__lock.release()
+        except IOError:  # Network is down
+            self.status = Feed.DOWNLOAD_FAILED
+        except Exception, err:
+            self.status = Feed.DOWNLOAD_FAILED
+            print "Comics!: Parsing error: %s" % err
+        self.__lock.release()
 
     def update(self):
         """Reload the feed."""
 
=== added file 'applets/maintained/comics/feed/plugins/__init__.py'
--- applets/maintained/comics/feed/plugins/__init__.py	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feed/plugins/__init__.py	2011-01-09 09:07:16 +0000
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2010 Gabor Karsay
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 
=== added file 'applets/maintained/comics/feed/plugins/simple_screen_scraper.py'
--- applets/maintained/comics/feed/plugins/simple_screen_scraper.py	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feed/plugins/simple_screen_scraper.py	2011-01-09 09:07:16 +0000
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2010 Gabor Karsay
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+from __future__ import with_statement
+
+import feedparser
+import re
+
+from ..basic import URL, TITLE, LINK, DATE, Feed
+from ..rss import IMAGES
+
+
+def get_class():
+    '''Mandatory for plugins.'''
+    return SimpleScreenScraper
+
+
+def matches_url(url):
+    '''Mandatory for plugins.
+    Return True if we want to read a comic from this url, else return False.
+    SimpleScreenScraper accepts all urls that are not feeds.'''
+    try:
+        feed = feedparser.parse(url)
+        if feed.version == '':
+            return True
+    except Exception:
+        return True
+    return False
+
+
+class SimpleScreenScraper(Feed):
+    """A SimpleScreenScraper class."""
+
+    def __init__(self, settings=None, url=None):
+        super(SimpleScreenScraper, self).__init__(settings, url)
+        if settings:
+            self.img_index = settings.get_int('img_index', 1) - 1
+        else:
+            self.img_index = 0
+
+    def parse_file(self, filename):
+        '''Mandatory for plugins.
+        Parses given file (a downloaded feed) and puts each found item
+        into a dict with the keys URL (path to the image), LINK to the 
+        page, TITLE for that link, DATE (a timestamp) and IMAGES (list of
+        images, only needed for new comics).
+        Each of this dicts has to be put into self.items with DATE as key.'''
+        try:
+            with open(filename, 'r') as f:
+                data = f.read()
+        except IOError:
+            return Feed.DOWNLOAD_FAILED
+
+        # Update properties
+        if self.name is None:
+            title_re = re.compile("<title>(.*?)<\/title>", re.DOTALL |
+                                                           re.M |
+                                                           re.IGNORECASE)
+            try:
+                self.name = self.unescape_html(title_re.findall(data)[0])
+            except IndexError:
+                self.name = "Comic"
+            
+
+        images = []
+        images += [self.make_absolute_url(u, self.url)
+                   for u in Feed.IMG_SRC_RE.findall(data)]
+
+        item = {}
+        try:
+            item[URL] = images[self.img_index]
+        except IndexError:
+            print "Comics!: img_index out of range in '%s'." % self.name
+            return Feed.DOWNLOAD_NOT_FEED
+        item[LINK] = self.url
+        item[TITLE] = self.name
+        item[DATE] = self.get_timestamp_for_url(item[URL])
+        if item[DATE] == None:
+            item[DATE] = 1.0
+        item[IMAGES] = images
+
+        self.items[item[DATE]] = item
+
+        if self.newest != item[DATE]:
+            self.newest = item[DATE]
+            self.updated = True
+        return Feed.DOWNLOAD_OK
+
+    def get_unique_images(self):
+        """Mandatory for plugins.
+        Returns a list of (index, url) tuples for the images."""
+        if len(self.items) == 0:
+            return None
+        items = self.items.itervalues()
+        item = items.next()
+        return list(enumerate(item[IMAGES]))
 
=== modified file 'applets/maintained/comics/feed/rss.py'
--- applets/maintained/comics/feed/rss.py	2010-01-04 07:40:00 +0000
+++ applets/maintained/comics/feed/rss.py	2011-01-09 09:07:16 +0000
@@ -89,9 +89,9 @@
 
         # Update properties
         if 'description' in feed:
-            self.description = feed.description
+            self.description = self.unescape_html(feed.description)
         if 'title' in feed.feed:
-            self.name = feed.feed.title
+            self.name = self.unescape_html(feed.feed.title)
 
         # Create an item-thread tuple for every entry
         threads = []
 
=== added file 'applets/maintained/comics/feeds/ben.feed'
--- applets/maintained/comics/feeds/ben.feed	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feeds/ben.feed	2011-01-09 09:07:16 +0000
@@ -0,0 +1,7 @@
+# Automatically generated by comics
+
+url=http://comics.com/ben/
+plugin=simple_screen_scraper
+name=Ben
+# The index of the image in the HTML-code
+img_index=4
 
=== modified file 'applets/maintained/comics/feeds/buttersafe.feed'
--- applets/maintained/comics/feeds/buttersafe.feed	2009-01-29 04:55:04 +0000
+++ applets/maintained/comics/feeds/buttersafe.feed	2011-01-09 09:07:16 +0000
@@ -1,6 +1,6 @@
 # Automatically generated by comics
 
-url=http://feeds.feedburner.com/Buttersafe
-name=Buttersafe
+url=http://feeds.feedburner.com/buttersafe
+name=Buttersafe - Updated Tuesdays and Thursdays
 # The index of the image in the HTML-code
-img_index=4
+img_index=5
 
=== added file 'applets/maintained/comics/feeds/calvinandhobbes.feed'
--- applets/maintained/comics/feeds/calvinandhobbes.feed	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feeds/calvinandhobbes.feed	2011-01-09 09:07:16 +0000
@@ -0,0 +1,6 @@
+# Automatically generated by comics
+
+url=http://feeds.feedburner.com/uclick/calvinandhobbes
+name=Calvin and Hobbes
+# The index of the image in the HTML-code
+img_index=27
 
=== added file 'applets/maintained/comics/feeds/ferdnand.feed'
--- applets/maintained/comics/feeds/ferdnand.feed	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feeds/ferdnand.feed	2011-01-09 09:07:16 +0000
@@ -0,0 +1,7 @@
+# Automatically generated by comics
+
+url=http://comics.com/ferdnand/
+plugin=simple_screen_scraper
+name=Ferd'nand
+# The index of the image in the HTML-code
+img_index=4
 
=== added file 'applets/maintained/comics/feeds/garfield.feed'
--- applets/maintained/comics/feeds/garfield.feed	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feeds/garfield.feed	2011-01-09 09:07:16 +0000
@@ -0,0 +1,6 @@
+# Automatically generated by comics
+
+url=http://feeds.feedburner.com/uclick/garfield
+name=Garfield
+# The index of the image in the HTML-code
+img_index=27
 
=== added file 'applets/maintained/comics/feeds/nancy.feed'
--- applets/maintained/comics/feeds/nancy.feed	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feeds/nancy.feed	2011-01-09 09:07:16 +0000
@@ -0,0 +1,7 @@
+# Automatically generated by comics
+
+url=http://comics.com/nancy/
+plugin=simple_screen_scraper
+name=Nancy
+# The index of the image in the HTML-code
+img_index=4
 
=== added file 'applets/maintained/comics/feeds/pcnp.feed'
--- applets/maintained/comics/feeds/pcnp.feed	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feeds/pcnp.feed	2011-01-09 09:07:16 +0000
@@ -0,0 +1,7 @@
+# Automatically generated by comics
+
+url=http://comics.com/pc_and_pixel/
+plugin=simple_screen_scraper
+name=PC and Pixel
+# The index of the image in the HTML-code
+img_index=4
 
=== added file 'applets/maintained/comics/feeds/peanuts.feed'
--- applets/maintained/comics/feeds/peanuts.feed	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feeds/peanuts.feed	2011-01-09 09:07:16 +0000
@@ -0,0 +1,7 @@
+# Automatically generated by comics
+
+url=http://comics.com/peanuts
+plugin=simple_screen_scraper
+name=Peanuts
+# The index of the image in the HTML-code
+img_index=6
 
=== removed file 'applets/maintained/comics/feeds/peanuts.feed'
--- applets/maintained/comics/feeds/peanuts.feed	2008-12-11 22:58:58 +0000
+++ applets/maintained/comics/feeds/peanuts.feed	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-name=Peanuts
-url=http://feeds.feedburner.com/tapestrypeanuts
 
=== modified file 'applets/maintained/comics/feeds/pearls.feed'
--- applets/maintained/comics/feeds/pearls.feed	2008-02-23 15:38:06 +0000
+++ applets/maintained/comics/feeds/pearls.feed	2011-01-09 09:07:16 +0000
@@ -1,5 +1,7 @@
-# Feed description
-
-name=Pearls before Swine
-url=http://feeds.feedburner.com/tapestrypearls
-
+# Automatically generated by comics
+
+url=http://comics.com/pearls_before_swine/
+plugin=simple_screen_scraper
+name=Pearls Before Swine
+# The index of the image in the HTML-code
+img_index=4
 
=== added file 'applets/maintained/comics/feeds/pickles.feed'
--- applets/maintained/comics/feeds/pickles.feed	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feeds/pickles.feed	2011-01-09 09:07:16 +0000
@@ -0,0 +1,6 @@
+# Automatically generated by comics
+
+url=http://feeds.feedburner.com/uclick/pickles
+name=Pickles
+# The index of the image in the HTML-code
+img_index=26
 
=== added file 'applets/maintained/comics/feeds/userfriendly.feed'
--- applets/maintained/comics/feeds/userfriendly.feed	1970-01-01 00:00:00 +0000
+++ applets/maintained/comics/feeds/userfriendly.feed	2011-01-09 09:07:16 +0000
@@ -0,0 +1,7 @@
+# Automatically generated by comics
+
+url=http://www.userfriendly.org/static/
+plugin=simple_screen_scraper
+name=UserFriendly.Org
+# The index of the image in the HTML-code
+img_index=4
 
=== modified file 'applets/maintained/comics/feeds/wizardofid.feed'
--- applets/maintained/comics/feeds/wizardofid.feed	2009-01-19 18:50:48 +0000
+++ applets/maintained/comics/feeds/wizardofid.feed	2011-01-09 09:07:16 +0000
@@ -1,3 +1,6 @@
-name=Wizard of ID
-url=http://feeds.gocomics.com/uclick/wizardofid
-img_index=17
+# Automatically generated by comics
+
+url=http://feeds.feedburner.com/uclick/wizardofid
+name=Wizard of Id
+# The index of the image in the HTML-code
+img_index=26
 
=== modified file 'applets/maintained/comics/ui/add.ui'
--- applets/maintained/comics/ui/add.ui	2010-01-26 03:46:15 +0000
+++ applets/maintained/comics/ui/add.ui	2011-01-09 09:07:16 +0000
@@ -1,77 +1,249 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.0 on Thu Feb 21 11:37:45 2008 -->
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAssistant" id="add_assistant">
     <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">4</property>
+    <property name="border_width">12</property>
     <property name="title" translatable="yes">Add Comic</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <property name="icon">comics.svg</property>
-    <signal handler="on_add_assistant_close" name="close"/>
-    <signal handler="on_add_assistant_cancel" name="cancel"/>
-    <signal handler="on_add_assistant_apply" name="apply"/>
-    <signal handler="on_add_assistant_prepare" name="prepare"/>
+    <signal name="apply" handler="on_add_assistant_apply"/>
+    <signal name="prepare" handler="on_add_assistant_prepare"/>
+    <signal name="cancel" handler="on_add_assistant_cancel"/>
+    <signal name="close" handler="on_add_assistant_close"/>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkVBox" id="intro_page">
         <property name="visible">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="spacing">10</property>
-        <child>
-          <object class="GtkLabel" id="intro_label">
+        <property name="border_width">12</property>
+        <property name="spacing">12</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox2">
             <property name="visible">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="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="label" translatable="yes">This guide will help you to add a new comic.
-
-To find comics suitable for adding, you may search the Internet for "comics rss".
-
-Press "next" to proceed.</property>
-            <property name="wrap">True</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="intro_label">
+                <property name="visible">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="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">This guide will help you to add a new comic.</property>
+                <property name="use_markup">True</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="intro_label2">
+                <property name="visible">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="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Please select how you want to add a comic:</property>
+                <property name="use_markup">True</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkAlignment" id="alignment1">
+                <property name="visible">True</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkVBox" id="vbox1">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkRadioButton" id="list_radio">
+                        <property name="label" translatable="yes">Select a comic from a list</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="on_radio_button_toggled"/>
+                      </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkRadioButton" id="url_radio">
+                        <property name="label" translatable="yes">Add a comic by URL</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <property name="group">list_radio</property>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">4</property>
+              </packing>
+            </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
       <packing>
-        <property name="page_type">GTK_ASSISTANT_PAGE_INTRO</property>
+        <property name="page_type">intro</property>
         <property name="title" translatable="yes">Add Comic</property>
         <property name="sidebar_image">logo.svg</property>
       </packing>
     </child>
     <child>
+      <placeholder/>
+    </child>
+    <child>
       <object class="GtkVBox" id="url_page">
         <property name="visible">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="spacing">10</property>
-        <child>
-          <object class="GtkHBox" id="url_page_hbox">
-            <property name="visible">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="spacing">10</property>
-            <child>
-              <object class="GtkLabel" id="url_page_label">
-                <property name="visible">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="xalign">1</property>
-                <property name="label" translatable="yes">Enter the URL of the RSS feed:</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="url_entry">
-                <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="text">http://</property>
-                <signal handler="on_url_entry_changed" name="changed"/>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
+        <property name="border_width">12</property>
+        <property name="spacing">12</property>
+        <child>
+          <object class="GtkVBox" id="url_box">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkLabel" id="intro_label1">
+                <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="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">Comics! needs either an RSS feed or a web page with a comic.
+
+Comics from feeds contain several strips. You may find suitable feeds on dedicated comics websites like &lt;a href="http://www.gocomics.com/features/rsspage"&gt;gocomics.com&lt;/a&gt;.
+
+Using a web page only the current comic is shown. You'll find suitable web pages e.g. at &lt;a href="http://www.comics.com/"&gt;comics.com&lt;/a&gt; or searching the web for "comics" or "webcomics".</property>
+                <property name="use_markup">True</property>
+                <property name="wrap">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="url_page_hbox">
+                <property name="visible">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="spacing">10</property>
+                <child>
+                  <object class="GtkLabel" id="url_page_label">
+                    <property name="visible">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="xalign">1</property>
+                    <property name="label" translatable="yes">URL of the RSS feed or web page:</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="url_entry">
+                    <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="invisible_char">&#x25CF;</property>
+                    <property name="activates_default">True</property>
+                    <property name="text">http://</property>
+                    <signal name="changed" handler="on_url_entry_changed"/>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </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="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <object class="GtkVBox" id="list_box">
+            <property name="visible">True</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkTreeView" id="pre_list">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="headers_visible">False</property>
+                    <property name="rules_hint">True</property>
+                    <child>
+                      <object class="GtkTreeViewColumn" id="pre_col">
+                        <property name="title">column</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
         </child>
       </object>
       <packing>
@@ -79,9 +251,13 @@
       </packing>
     </child>
     <child>
+      <placeholder/>
+    </child>
+    <child>
       <object class="GtkVBox" id="wait_page">
         <property name="visible">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="border_width">12</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkLabel" id="wait_label">
@@ -91,10 +267,13 @@
             <property name="yalign">0</property>
             <property name="wrap">True</property>
           </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
       </object>
       <packing>
-        <property name="page_type">GTK_ASSISTANT_PAGE_PROGRESS</property>
+        <property name="page_type">progress</property>
         <property name="title" translatable="yes">Downloading Comic</property>
       </packing>
     </child>
@@ -102,6 +281,7 @@
       <object class="GtkVBox" id="image_page">
         <property name="visible">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="border_width">12</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkLabel" id="label_image_page">
@@ -115,6 +295,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -122,16 +303,21 @@
             <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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
               <object class="GtkIconView" id="image_list">
                 <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="pixbuf_column">1</property>
                 <property name="item_width">100</property>
-                <signal handler="on_image_list_selection_changed" name="selection_changed"/>
+                <signal name="selection_changed" handler="on_image_list_selection_changed"/>
+                <child>
+                  <object class="GtkCellRendererPixbuf" id="cellrenderertext"/>
+                  <attributes>
+                    <attribute name="pixbuf">1</attribute>
+                  </attributes>
+                </child>
               </object>
             </child>
           </object>
@@ -148,6 +334,7 @@
       <object class="GtkVBox" id="last_page">
         <property name="visible">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="border_width">12</property>
         <property name="spacing">10</property>
         <child>
           <object class="GtkLabel" id="last_label">
@@ -159,12 +346,49 @@
             <property name="wrap">True</property>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHBox" id="name_box">
+            <property name="visible">True</property>
+            <property name="spacing">12</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Name of the comic:</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="name_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">&#x25CF;</property>
+                <property name="activates_default">True</property>
+                <signal name="changed" handler="on_name_entry_changed"/>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="page_type">GTK_ASSISTANT_PAGE_CONFIRM</property>
+        <property name="page_type">confirm</property>
         <property name="title" translatable="yes">Ready to add comic!</property>
       </packing>
     </child>
 
=== modified file 'applets/maintained/comics/ui/manage.ui'
--- applets/maintained/comics/ui/manage.ui	2010-01-26 03:46:15 +0000
+++ applets/maintained/comics/ui/manage.ui	2011-01-09 09:07:16 +0000
@@ -1,45 +1,60 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.0 on Thu Feb 21 11:35:04 2008 -->
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="manage_window">
     <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">6</property>
     <property name="title" translatable="yes">Manage comics</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <property name="default_width">300</property>
-    <property name="default_height">400</property>
+    <property name="window_position">center</property>
     <property name="icon">manage.svg</property>
     <child>
       <object class="GtkVBox" id="manage_window_vbox">
         <property name="visible">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="border_width">2</property>
-        <property name="spacing">5</property>
+        <property name="spacing">6</property>
         <child>
-          <object class="GtkLabel" id="manage_window_label">
-            <property name="visible">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="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="label" translatable="yes">The following comics are installed:</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
+          <placeholder/>
         </child>
         <child>
           <object class="GtkScrolledWindow" id="manage_window_scrolledwindow">
             <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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
               <object class="GtkTreeView" id="comics_list">
                 <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">False</property>
+                <property name="headers_clickable">False</property>
+                <property name="rules_hint">True</property>
+                <child>
+                  <object class="GtkTreeViewColumn" id="toggle_col">
+                    <property name="title">column</property>
+                    <child>
+                      <object class="GtkCellRendererToggle" id="cellrenderertoggle1">
+                        <signal name="toggled" handler="on_feed_toggled"/>
+                      </object>
+                      <attributes>
+                        <attribute name="active">0</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkTreeViewColumn" id="name_col">
+                    <property name="title">column</property>
+                    <child>
+                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                      <attributes>
+                        <attribute name="text">1</attribute>
+                      </attributes>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
@@ -51,44 +66,55 @@
           <object class="GtkHButtonBox" id="manage_window_hbuttonbox">
             <property name="visible">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="layout_style">GTK_BUTTONBOX_SPREAD</property>
+            <property name="border_width">6</property>
+            <property name="spacing">6</property>
+            <property name="layout_style">spread</property>
             <child>
               <object class="GtkButton" id="add_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">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="label">gtk-add</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">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="use_stock">True</property>
-                <signal handler="on_add_button_clicked" name="clicked"/>
+                <signal name="clicked" handler="on_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="remove_button">
+                <property name="label">gtk-remove</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">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="label">gtk-remove</property>
                 <property name="use_stock">True</property>
-                <signal handler="on_remove_button_clicked" name="clicked"/>
+                <signal name="clicked" handler="on_remove_button_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="close_button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">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="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">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="use_stock">True</property>
-                <signal handler="on_close_button_clicked" name="clicked"/>
+                <signal name="clicked" handler="on_close_button_clicked"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
 
=== removed file 'applets/maintained/comics/ui/view.ui'
--- applets/maintained/comics/ui/view.ui	2010-03-25 12:38:35 +0000
+++ applets/maintained/comics/ui/view.ui	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkUIManager" id="uimanager1">
-    <child>
-      <object class="GtkActionGroup" id="actiongroup1">
-        <child>
-          <object class="GtkAction" id="history_container">
-            <property name="stock_id">gtk-jump-to</property>
-            <property name="name">history_container</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="size_container">
-            <property name="name">size_container</property>
-            <property name="label" translatable="yes">Size</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="zoom_normal_item">
-            <property name="stock_id">gtk-zoom-100</property>
-            <property name="name">zoom_normal_item</property>
-            <signal handler="on_normal_activated" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="zoom_in_item">
-            <property name="stock_id">gtk-zoom-in</property>
-            <property name="name">zoom_in_item</property>
-            <signal handler="on_larger_activated" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="zoom_out_item">
-            <property name="stock_id">gtk-zoom-out</property>
-            <property name="name">zoom_out_item</property>
-            <signal handler="on_smaller_activated" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleAction" id="show_link_item">
-            <property name="name">show_link_item</property>
-            <property name="label" translatable="yes">Show link</property>
-            <signal handler="on_show_link_toggled" name="toggled"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="save_as_item">
-            <property name="stock_id">gtk-save-as</property>
-            <property name="name">save_as_item</property>
-            <signal handler="on_save_as_activated" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="close_item">
-            <property name="stock_id">gtk-close</property>
-            <property name="name">close_item</property>
-            <signal handler="on_close_activated" name="activate"/>
-          </object>
-        </child>
-      </object>
-    </child>
-    <ui>
-      <popup name="history_menu">
-        <menu action="history_container"/>
-        <menu action="size_container">
-          <menuitem action="zoom_normal_item"/>
-          <menuitem action="zoom_in_item"/>
-          <menuitem action="zoom_out_item"/>
-        </menu>
-        <menuitem action="show_link_item"/>
-        <menuitem action="save_as_item"/>
-        <menuitem action="close_item"/>
-      </popup>
-    </ui>
-  </object>
-  <object class="GtkMenu" constructor="uimanager1" id="history_menu">
-    <property name="visible">True</property>
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <signal handler="on_widget_show" name="show"/>
-  </object>
-  <object class="GtkFileChooserDialog" id="save_as_dialog">
-    <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="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="icon">comics.svg</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <property name="use_preview_label">False</property>
-    <property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property>
-    <property name="do_overwrite_confirmation">True</property>
-    <property name="preview_widget_active">False</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="save_as_dialog_vbox">
-        <property name="visible">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="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkComboBox" id="file_format_combo">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <signal handler="on_file_format_combo_changed" name="changed"/>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="action_area_hbuttonbox">
-            <property name="visible">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="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="action_area_cancel">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">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="label">gtk-cancel</property>
-                <property name="use_stock">True</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton" id="action_area_save">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">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="label">gtk-save</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">action_area_cancel</action-widget>
-      <action-widget response="1">action_area_save</action-widget>
-    </action-widgets>
-  </object>
-</interface>
 
=== removed file 'applets/unmaintained/comic/Makefile.am'
--- applets/unmaintained/comic/Makefile.am	2009-02-01 00:13:07 +0000
+++ applets/unmaintained/comic/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-APPLET_NAME = comic
-APPLET_MAIN_FILE = comic.py
-include $(top_srcdir)/Makefile.python-applet
-
-dist_applet_DATA =	\
-	comicdialog.py	\
-	getben.py	\
-	getborn.py	\
-	getdilbert.py	\
-	getferdnand.py	\
-	getgarfield.py	\
-	getnancy.py	\
-	getpcnp.py	\
-	getpeanuts.py	\
-	getpickles.py	\
-	getuf.py	\
-	getxkcd.py	\
-	getwiz.py	\
-	$(NULL)
-
-comic_iconsdir = $(applet_datadir)/icons
-dist_comic_icons_DATA =		\
-	icons/comic-applet.png	\
-	$(NULL)
 
=== removed file 'applets/unmaintained/comic/comic.desktop.in'
--- applets/unmaintained/comic/comic.desktop.in	2009-10-06 19:42:48 +0000
+++ applets/unmaintained/comic/comic.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-_Name=Dilbert Applet
-Type=Application
-X-AWN-Type=Applet
-X-AWN-AppletType=Python
-_Comment=Read Dilbert and other comics
-Exec=awn-applet -p %k
-X-AWN-AppletExec=comic/comic.py
-Icon=comic/icons/comic-applet.png
-X-AWN-AppletCategory=Network,News,Amusement
 
=== removed file 'applets/unmaintained/comic/comic.py'
--- applets/unmaintained/comic/comic.py	2009-08-14 13:00:22 +0000
+++ applets/unmaintained/comic/comic.py	1970-01-01 00:00:00 +0000
@@ -1,226 +0,0 @@
-#!/usr/bin/python
-# -*- coding: iso-8859-15 -*-
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# Name:        comic.py
-# Version:     .5.
-# Date:        10-15-07
-# Description: A python Applet for the avant-windows-navigator to display comic strips.
-#
-# Authors:     cj13
-#             pavpanchekha
-
-import sys, os
-import gobject
-import gtk
-import awn
-import comicdialog
-#default comic
-GETWHAT = 'getdilbert.py'
-showhover = False
-
-class App (awn.AppletSimple):
-    titleText = "Daily Comic"
-    visible = False
-
-    def __init__ (self, uid, orient, height):
-        awn.AppletSimple.__init__ (self, uid, orient, height)
-        self.set_awn_icon('comic', 'comic-applet')
-
-        self.title = awn.awn_title_get_default ()
-        self.dialog = awn.AppletDialog (self)
-        self.connect ("button-press-event", self.button_press)
-        self.connect ("enter-notify-event", self.enter_notify)
-        self.connect ("leave-notify-event", self.leave_notify)
-        self.dialog.connect ("focus-out-event", self.dialog_focus_out)
-
-        # Setup popup menu
-        self.popup_menu = self.create_default_menu()
-        dil_item = gtk.MenuItem("Dilbert")
-        pnut_item = gtk.MenuItem("Peanuts")
-        born_item = gtk.MenuItem("The Born Loser")
-        ben_item = gtk.MenuItem("Ben")
-        ferdnand_item = gtk.MenuItem("Ferdnand")
-        nancy_item = gtk.MenuItem("Nancy")
-        pickles_item = gtk.MenuItem("Pickles")
-        garfield_item = gtk.MenuItem("Garfield")
-        uf_item = gtk.MenuItem("User Friendly")
-        wiz_item = gtk.MenuItem("Wizard of ID")
-        xkcd_item = gtk.MenuItem("xkcd")
-        showho_item = gtk.CheckMenuItem("Hide Strip on Hover")
-        self.popup_menu.append(dil_item)
-        self.popup_menu.append(pnut_item)
-        self.popup_menu.append(born_item)
-        self.popup_menu.append(ben_item)
-        self.popup_menu.append(ferdnand_item)
-        self.popup_menu.append(nancy_item)
-        self.popup_menu.append(pickles_item)
-        self.popup_menu.append(garfield_item)
-        self.popup_menu.append(uf_item)
-        self.popup_menu.append(wiz_item)
-        self.popup_menu.append(xkcd_item)
-        self.popup_menu.append(showho_item)
-        dil_item.connect_object("activate",self.dil_callback,self)
-        pnut_item.connect_object("activate",self.pnut_callback,self)
-        born_item.connect_object("activate",self.born_callback,self)
-        ben_item.connect_object("activate",self.ben_callback,self)
-        ferdnand_item.connect_object("activate",self.ferdnand_callback,self)
-        nancy_item.connect_object("activate",self.nancy_callback,self)
-        pickles_item.connect_object("activate",self.pickles_callback,self)
-        garfield_item.connect_object("activate",self.garfield_callback,self)
-        uf_item.connect_object("activate",self.uf_callback,self)
-        wiz_item.connect_object("activate",self.wiz_callback,self)
-        xkcd_item.connect_object("activate",self.xkcd_callback,self)
-        showho_item.connect_object("activate",self.showho_callback,self)
-        dil_item.show()
-        pnut_item.show()
-        born_item.show()
-        ben_item.show()
-        ferdnand_item.show()
-        nancy_item.show()
-        pickles_item.show()
-        garfield_item.show()
-        uf_item.show()
-        wiz_item.show()
-        xkcd_item.show()
-        showho_item.show()
-
-        self.build_dialog()
-
-
-    def build_dialog(self):
-        #print "Getting Comic"
-
-        getit = 'python ' + os.path.dirname (__file__) + '/' + GETWHAT
-        os.system(getit)
-
-        self.dialog = awn.AppletDialog (self)
-        self.dialog.set_title("Comic")
-
-        box = gtk.VBox()
-        comic = comicdialog.ComicDialog()
-        box.pack_start(comic,False,False,0)
-        box.show_all()
-        self.dialog.add(box)
-
-        self.timer = gobject.timeout_add (3600000, self.build_dialog)
-
-
-    def button_press (self, widget, event):
-        if event.button == 3:
-                # right click
-                self.title.hide(self)
-                self.visible = False
-                self.dialog.hide()
-                self.popup_menu.popup(None, None, None, event.button, event.time)
-        elif event.button == 1:
-            if self.visible:
-                self.dialog.hide()
-                self.title.hide(self)
-            else:
-                self.title.hide(self)
-                self.dialog.show_all()
-            self.visible = not self.visible
-
-
-    def dil_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getdilbert.py'
-        self.build_dialog()
-
-
-    def pnut_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getpeanuts.py'
-        self.build_dialog()
-
-    def born_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getborn.py'
-        self.build_dialog()
-
-    def ben_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getben.py'
-        self.build_dialog()
-
-    def ferdnand_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getferdnand.py'
-        self.build_dialog()
-
-    def nancy_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getnancy.py'
-        self.build_dialog()
-
-    def pickles_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getpickles.py'
-        self.build_dialog()
-
-    def garfield_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getgarfield.py'
-        self.build_dialog()
-
-    def uf_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getuf.py'
-        self.build_dialog()
-
-    def wiz_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getwiz.py'
-        self.build_dialog()
-
-    def xkcd_callback(self, widget):
-        global GETWHAT
-        GETWHAT = 'getxkcd.py'
-        self.build_dialog()
-
-    def showho_callback(self, widget):
-        global showhover
-        showhover = not showhover
-
-
-    def dialog_focus_out (self, widget, event):
-        self.visible = False
-        self.dialog.hide()
-
-
-    def enter_notify (self, widget, event):
-        global showhover
-        self.title.show (self, self.titleText)
-        if showhover:
-            self.title.hide(self)
-            self.dialog.show_all()
-            self.visible = False
-
-    def leave_notify (self, widget, event):
-        global showhover
-        self.title.hide(self)
-        if showhover:
-            self.dialog.hide()
-            self.visible = False
-
-
-if __name__ == "__main__":
-    awn.init (sys.argv[1:])
-    #print "main %s %d %d" % (awn.uid, awn.orient, awn.height)
-    applet = App(awn.uid, awn.orient, awn.height)
-    awn.embed_applet(applet)
-    applet.show_all()
-    gtk.main()
 
=== removed file 'applets/unmaintained/comic/comicdialog.py'
--- applets/unmaintained/comic/comicdialog.py	2008-08-23 00:52:27 +0000
+++ applets/unmaintained/comic/comicdialog.py	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-#!/usr/bin/python
-# -*- coding: iso-8859-15 -*-
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-# Name:        comic.py
-# Version:     .5.
-# Date:        10-15-07
-# Description: A python Applet for the avant-windows-navigator to display comic strips.
-#
-# Authors:     cj13
-#
-import gtk
-from gtk import gdk
-import cairo
-
-class ComicDialog(gtk.DrawingArea):
-	def __init__(self):
-		gtk.DrawingArea.__init__(self)
-		self.connect("expose_event", self.expose)
-
-	def expose(self,widget,event):
-		icon_name = '/tmp/dilbert.gif'
-		icon = gdk.pixbuf_new_from_file(icon_name)
-		dim = [icon.get_width(),icon.get_height()]
-		self.set_size_request(dim[0], dim[1])
-
-		context = widget.window.cairo_create()
-		context.set_source_rgb(0,0,0)
-
-		context.set_source_pixbuf(icon,1,1)
-		context.fill()
-		context.paint()
-		return False
-
 
=== removed file 'applets/unmaintained/comic/getben.py'
--- applets/unmaintained/comic/getben.py	2008-11-21 20:19:36 +0000
+++ applets/unmaintained/comic/getben.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# get_bornloser_strips.py -- fetch strips of last N days
-
-################################################################
-# BEGIN configuration
-
-number_of_days = 1
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import sys
-import urllib
-import re
-
-from string import join
-from datetime import datetime, timedelta
-
-if len(sys.argv) > 1:
-    number_of_days = int(sys.argv[1])
-
-pattern  = re.compile('str_strip[0-9/]+\\.full\\.gif')
-pattern2 = re.compile('str_strip[0-9/]+\\.full\\.jpg')
-temp1 = 'http://www.comics.com/ben/%s/'
-temp2 = 'http://assets.comics.com/dyn/%s'
-
-date = datetime.today()
-one_day = timedelta(1)
-
-filename = None
-
-for i in range(number_of_days):
-    url = temp1 % (date.strftime('%Y-%m-%d'))
-    #print '? %s' % (url)
-    fil = urllib.urlopen(url)
-    for line in fil:
-        match = pattern.search(line)
-        if match != None:
-            filename = match.group()
-            break
-    	else:
-	    match2 = pattern2.search(line)
-	    if match2 != None:
-	        filename = match2.group()
-                break
-    fil.close()
-
-    if filename != None:
-        url = temp2 % (filename)
-        #print '+ %s' % (url)
-        fil = urllib.urlopen(url)
-        diskfile = file(path_prefix + 'dilbert.gif', 'w')
-        diskfile.write(fil.read())
-        fil.close()
-        diskfile.close()
-
-    date = date - one_day
-    filename = None
 
=== removed file 'applets/unmaintained/comic/getborn.py'
--- applets/unmaintained/comic/getborn.py	2008-11-21 20:19:36 +0000
+++ applets/unmaintained/comic/getborn.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# get_bornloser_strips.py -- fetch strips of last N days
-
-################################################################
-# BEGIN configuration
-
-number_of_days = 1
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import sys
-import urllib
-import re
-
-from string import join
-from datetime import datetime, timedelta
-
-if len(sys.argv) > 1:
-    number_of_days = int(sys.argv[1])
-
-pattern = re.compile('str_strip[0-9/]+\\.full\\.gif')
-pattern2 = re.compile('str_strip[0-9/]+\\.full\\.jpg')
-temp1 = 'http://comics.com/the_born_loser/%s/'
-temp2 = 'http://assets.comics.com/dyn/%s'
-
-date = datetime.today()
-one_day = timedelta(1)
-
-filename = None
-
-for i in range(number_of_days):
-    url = temp1 % (date.strftime('%Y%m%d'))
-    #print '? %s' % (url)
-    fil = urllib.urlopen(url)
-    for line in fil:
-        match = pattern.search(line)
-        if match != None:
-            filename = match.group()
-            break
-    	else:
-	    match2 = pattern2.search(line)
-	    if match2 != None:
-	        filename = match2.group()
-                break
-    fil.close()
-
-    if filename != None:
-        url = temp2 % (filename)
-        #print '+ %s' % (url)
-        fil = urllib.urlopen(url)
-        diskfile = file(path_prefix + 'dilbert.gif', 'w')
-        diskfile.write(fil.read())
-        fil.close()
-        diskfile.close()
-
-    date = date - one_day
-    filename = None
 
=== removed file 'applets/unmaintained/comic/getdilbert.py'
--- applets/unmaintained/comic/getdilbert.py	2008-11-21 20:19:36 +0000
+++ applets/unmaintained/comic/getdilbert.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# get_dilbert_strips.py -- fetch dilbert strips of last N days
-
-################################################################
-# BEGIN configuration
-
-number_of_days = 1
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import sys
-import urllib
-import re
-
-from string import join
-from datetime import datetime, timedelta
-
-if len(sys.argv) > 1:
-    number_of_days = int(sys.argv[1])
-
-pattern = re.compile('str_strip[0-9/]+\\.strip\\.gif')
-pattern2 = re.compile('str_strip[0-9/]+\\.strip\\.sunday\\.gif')
-temp1 = 'http://dilbert.com/%s/'
-temp2 = 'http://dilbert.com/dyn/%s'
-
-date = datetime.today()
-one_day = timedelta(1)
-
-filename = None
-
-for i in range(number_of_days):
-    url = temp1 % (date.strftime('%Y-%m-%d'))
-    #print '? %s' % (url)
-    fil = urllib.urlopen(url)
-    for line in fil:
-        match = pattern.search(line)
-        if match != None:
-            filename = match.group()
-            break
-    	else:
-	    match2 = pattern2.search(line)
-	    if match2 != None:
-	        filename = match2.group()
-                break
-    fil.close()
-
-    if filename != None:
-        url = temp2 % (filename)
-        #print '+ %s' % (url)
-        fil = urllib.urlopen(url)
-        diskfile = file(path_prefix + 'dilbert.gif', 'w')
-        diskfile.write(fil.read())
-        fil.close()
-        diskfile.close()
-
-    date = date - one_day
-    filename = None
 
=== removed file 'applets/unmaintained/comic/getferdnand.py'
--- applets/unmaintained/comic/getferdnand.py	2008-11-21 20:19:36 +0000
+++ applets/unmaintained/comic/getferdnand.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# get_bornloser_strips.py -- fetch strips of last N days
-
-################################################################
-# BEGIN configuration
-
-number_of_days = 1
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import sys
-import urllib
-import re
-
-from string import join
-from datetime import datetime, timedelta
-
-if len(sys.argv) > 1:
-    number_of_days = int(sys.argv[1])
-
-pattern  = re.compile('str_strip[0-9/]+\\.full\\.gif')
-pattern2 = re.compile('str_strip[0-9/]+\\.full\\.jpg')
-temp1 = 'http://comics.com/ferdnand/%s/'
-temp2 = 'http://assets.comics.com/dyn/%s'
-
-date = datetime.today()
-one_day = timedelta(1)
-
-filename = None
-
-for i in range(number_of_days):
-    url = temp1 % (date.strftime('%Y%m%d'))
-    #print '? %s' % (url)
-    fil = urllib.urlopen(url)
-    for line in fil:
-        match = pattern.search(line)
-        if match != None:
-            filename = match.group()
-            break
-    	else:
-	    match2 = pattern2.search(line)
-	    if match2 != None:
-	        filename = match2.group()
-                break
-    fil.close()
-
-    if filename != None:
-        url = temp2 % (filename)
-        #print '+ %s' % (url)
-        fil = urllib.urlopen(url)
-        diskfile = file(path_prefix + 'dilbert.gif', 'w')
-        diskfile.write(fil.read())
-        fil.close()
-        diskfile.close()
-
-    date = date - one_day
-    filename = None
 
=== removed file 'applets/unmaintained/comic/getgarfield.py'
--- applets/unmaintained/comic/getgarfield.py	2009-01-16 17:07:28 +0000
+++ applets/unmaintained/comic/getgarfield.py	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# getgarfield.py -- fetch strips of last N days
-
-################################################################
-# BEGIN configuration
-
-number_of_days = 1
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import sys
-import urllib
-import re
-
-from string import join
-from datetime import datetime, timedelta
-
-if len(sys.argv) > 1:
-    number_of_days = int(sys.argv[1])
-
-temp = 'http://picayune.uclick.com/comics/ga/%s/ga%s.%s'
-
-date = datetime.today()
-one_day = timedelta(1)
-
-for i in range(number_of_days):
-
-    giforjpg = 'gif'
-      
-    url = temp % (date.strftime('%Y'),date.strftime('%y%m%d'),giforjpg)
-    print '+ %s' % (url)
-    fil = urllib.urlopen(url)
-    diskfile = file(path_prefix + 'dilbert.gif', 'w')
-    diskfile.write(fil.read())
-    fil.close()
-    diskfile.close()
-
-    date = date - one_day
 
=== removed file 'applets/unmaintained/comic/getnancy.py'
--- applets/unmaintained/comic/getnancy.py	2008-11-21 20:19:36 +0000
+++ applets/unmaintained/comic/getnancy.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# get_bornloser_strips.py -- fetch strips of last N days
-
-################################################################
-# BEGIN configuration
-
-number_of_days = 1
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import sys
-import urllib
-import re
-
-from string import join
-from datetime import datetime, timedelta
-
-if len(sys.argv) > 1:
-    number_of_days = int(sys.argv[1])
-
-pattern  = re.compile('str_strip[0-9/]+\\.full\\.gif')
-pattern2 = re.compile('str_strip[0-9/]+\\.full\\.jpg')
-temp1 = 'http://www.comics.com/nancy/%s/'
-temp2 = 'http://assets.comics.com/dyn/%s'
-
-date = datetime.today()
-one_day = timedelta(1)
-
-filename = None
-
-for i in range(number_of_days):
-    url = temp1 % (date.strftime('%Y%m%d'))
-    #print '? %s' % (url)
-    fil = urllib.urlopen(url)
-    for line in fil:
-        match = pattern.search(line)
-        if match != None:
-            filename = match.group()
-            break
-    	else:
-	    match2 = pattern2.search(line)
-	    if match2 != None:
-	        filename = match2.group()
-                break
-    fil.close()
-
-    if filename != None:
-        url = temp2 % (filename)
-        #print '+ %s' % (url)
-        fil = urllib.urlopen(url)
-        diskfile = file(path_prefix + 'dilbert.gif', 'w')
-        diskfile.write(fil.read())
-        fil.close()
-        diskfile.close()
-
-    date = date - one_day
-    filename = None
 
=== removed file 'applets/unmaintained/comic/getpcnp.py'
--- applets/unmaintained/comic/getpcnp.py	2008-08-23 00:52:27 +0000
+++ applets/unmaintained/comic/getpcnp.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# get_pcnpixel_strips.py -- fetch strips of last N days
-
-################################################################
-# BEGIN configuration
-
-number_of_days = 1
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import sys
-import urllib
-import re
-
-from string import join
-from datetime import datetime, timedelta
-
-if len(sys.argv) > 1:
-    number_of_days = int(sys.argv[1])
-
-pattern = re.compile('pcnpixel\\d+\\.gif')
-pattern2 = re.compile('pcnpixel\\d+\\.jpg')
-temp1 = 'http://www.snoopy.com/wash/pcnpixel%s.html'
-temp2 = 'http://www.snoopy.com/wash/pcnpixel/archive/images/%s'
-
-date = datetime.today()
-one_day = timedelta(1)
-
-filename = None
-
-for i in range(number_of_days):
-    url = temp1 % (date.strftime('%Y%m%d'))
-    #print '? %s' % (url)
-    fil = urllib.urlopen(url)
-    for line in fil:
-        match = pattern.search(line)
-        if match != None:
-            filename = match.group()
-            break
-    	else:
-	    match2 = pattern2.search(line)
-	    if match2 != None:
-	        filename = match2.group()
-                break
-    fil.close()
-
-    if filename != None:
-        url = temp2 % (filename)
-        #print '+ %s' % (url)
-        fil = urllib.urlopen(url)
-        diskfile = file(path_prefix + 'dilbert.gif', 'w')
-        diskfile.write(fil.read())
-        fil.close()
-        diskfile.close()
-
-    date = date - one_day
-    filename = None
 
=== removed file 'applets/unmaintained/comic/getpeanuts.py'
--- applets/unmaintained/comic/getpeanuts.py	2008-11-21 20:19:36 +0000
+++ applets/unmaintained/comic/getpeanuts.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# get_peanuts_strips.py -- fetch peanuts strips of last N days
-
-################################################################
-# BEGIN configuration
-
-number_of_days = 1
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import sys
-import urllib
-import re
-
-from string import join
-from datetime import datetime, timedelta
-
-if len(sys.argv) > 1:
-    number_of_days = int(sys.argv[1])
-
-pattern = re.compile('str_strip[0-9/]+\\.full\\.gif')
-pattern2 = re.compile('str_strip[0-9/]+\\.full\\.jpg')
-temp1 = 'http://comics.com/peanuts/%s/'
-temp2 = 'http://assets.comics.com/dyn/%s'
-
-date = datetime.today()
-one_day = timedelta(1)
-
-filename = None
-
-for i in range(number_of_days):
-    url = temp1 % (date.strftime('%Y%m%d'))
-    #print '? %s' % (url)
-    fil = urllib.urlopen(url)
-    for line in fil:
-        match = pattern.search(line)
-        if match != None:
-            filename = match.group()
-            break
-    	else:
-	    match2 = pattern2.search(line)
-	    if match2 != None:
-	        filename = match2.group()
-                break
-    fil.close()
-
-    if filename != None:
-        url = temp2 % (filename)
-        #print '+ %s' % (url)
-        fil = urllib.urlopen(url)
-        diskfile = file(path_prefix + 'dilbert.gif', 'w')
-        diskfile.write(fil.read())
-        fil.close()
-        diskfile.close()
-
-    date = date - one_day
-    filename = None
 
=== removed file 'applets/unmaintained/comic/getpickles.py'
--- applets/unmaintained/comic/getpickles.py	2008-11-21 20:19:36 +0000
+++ applets/unmaintained/comic/getpickles.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# get_bornloser_strips.py -- fetch strips of last N days
-
-################################################################
-# BEGIN configuration
-
-number_of_days = 1
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import sys
-import urllib
-import re
-
-from string import join
-from datetime import datetime, timedelta
-
-if len(sys.argv) > 1:
-    number_of_days = int(sys.argv[1])
-
-pattern  = re.compile('str_strip[0-9/]+\\.full\\.gif')
-pattern2 = re.compile('str_strip[0-9/]+\\.full\\.jpg')
-temp1 = 'http://www.comics.com/pickles/%s/'
-temp2 = 'http://assets.comics.com/dyn/%s'
-
-date = datetime.today()
-one_day = timedelta(1)
-
-filename = None
-
-for i in range(number_of_days):
-    url = temp1 % (date.strftime('%Y-%m-%d'))
-    #print '? %s' % (url)
-    fil = urllib.urlopen(url)
-    for line in fil:
-        match = pattern.search(line)
-        if match != None:
-            filename = match.group()
-            break
-    	else:
-	    match2 = pattern2.search(line)
-	    if match2 != None:
-	        filename = match2.group()
-                break
-    fil.close()
-
-    if filename != None:
-        url = temp2 % (filename)
-        #print '+ %s' % (url)
-        fil = urllib.urlopen(url)
-        diskfile = file(path_prefix + 'dilbert.gif', 'w')
-        diskfile.write(fil.read())
-        fil.close()
-        diskfile.close()
-
-    date = date - one_day
-    filename = None
 
=== renamed file 'applets/unmaintained/comic/getuf.py' => 'applets/unmaintained/comic/getuf.py.THIS'
=== removed file 'applets/unmaintained/comic/getwiz.py'
--- applets/unmaintained/comic/getwiz.py	2008-11-21 20:19:36 +0000
+++ applets/unmaintained/comic/getwiz.py	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# get_wizofid_strips.py -- fetch wizofids strips of last N days
-
-################################################################
-# BEGIN configuration
-
-number_of_days = 1
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import sys
-import urllib
-import re
-
-from string import join
-from datetime import datetime, timedelta
-
-if len(sys.argv) > 1:
-    number_of_days = int(sys.argv[1])
-
-pattern = re.compile('str_strip[0-9/]+\\.full\\.gif')
-pattern2 = re.compile('str_strip[0-9/]+\\.full\\.jpg')
-temp1 = 'http://comics.com/wizard_of_id/%s/'
-temp2 = 'http://assets.comics.com/dyn/%s'
-
-date = datetime.today()
-one_day = timedelta(1)
-
-filename = None
-
-for i in range(number_of_days):
-    url = temp1 % (date.strftime('%Y%m%d'))
-    #print '? %s' % (url)
-    fil = urllib.urlopen(url)
-    for line in fil:
-        match = pattern.search(line)
-        if match != None:
-            filename = match.group()
-            break
-    	else:
-	    match2 = pattern2.search(line)
-	    if match2 != None:
-	        filename = match2.group()
-                break
-    fil.close()
-
-    if filename != None:
-        url = temp2 % (filename)
-        #print '+ %s' % (url)
-        fil = urllib.urlopen(url)
-        diskfile = file(path_prefix + 'dilbert.gif', 'w')
-        diskfile.write(fil.read())
-        fil.close()
-        diskfile.close()
-
-    date = date - one_day
-    filename = None
 
=== removed file 'applets/unmaintained/comic/getxkcd.py'
--- applets/unmaintained/comic/getxkcd.py	2008-08-23 00:52:27 +0000
+++ applets/unmaintained/comic/getxkcd.py	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#!/usr/bin/python
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-################################################################
-# getxkcd.py -- fetch last (current) xkcd strip
-
-################################################################
-# BEGIN configuration
-
-
-path_prefix = '/tmp/' # where do you want to save the files?
-
-# --END configuration
-################################################################
-
-import urllib
-import re
-
-
-comic = urllib.urlopen("http://www.xkcd.com/")
-link = re.compile("http://imgs.xkcd.com/comics/.*png").search(comic.read(),1)
-fil = urllib.urlopen(link.group())
-
-diskfile = file(path_prefix + 'dilbert.gif', 'w')
-diskfile.write(fil.read())
-fil.close()
-diskfile.close()
-
 
=== removed directory 'applets/unmaintained/comic/icons'
=== removed file 'applets/unmaintained/comic/icons/comic-applet.png'
 Binary files applets/unmaintained/comic/icons/comic-applet.png	2008-07-18 02:16:24 +0000 and applets/unmaintained/comic/icons/comic-applet.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'debian/awn-applets-python-extras-trunk.install'
--- debian/awn-applets-python-extras-trunk.install	2010-09-30 16:12:44 +0000
+++ debian/awn-applets-python-extras-trunk.install	2011-01-09 09:07:16 +0000
@@ -49,9 +49,6 @@
 # Disabled applets #
 ####################
 #
-#usr/share/avant-window-navigator/applets/comic/
-#usr/share/avant-window-navigator/applets/comic.desktop
-#
 # Rtm
 #
 #usr/share/avant-window-navigator/applets/rtm/
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-10-22 17:00:33 +0000
+++ po/POTFILES.in	2011-01-09 09:07:16 +0000
@@ -43,7 +43,6 @@
 applets/maintained/comics/feed/__init__.py
 [type: gettext/glade]applets/maintained/comics/ui/add.ui
 [type: gettext/glade]applets/maintained/comics/ui/manage.ui
-[type: gettext/glade]applets/maintained/comics/ui/view.ui
 applets/maintained/comics/main.py
 applets/maintained/common-folder/common-folder.desktop.in
 applets/maintained/common-folder/common-folder.py
 
=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2010-10-15 18:18:48 +0000
+++ po/POTFILES.skip	2011-01-09 09:07:16 +0000
@@ -26,7 +26,6 @@
 # Disabled applets
 #
 applets/maintained/rtm/rtm.desktop.in
-applets/unmaintained/comic/comic.desktop.in
 applets/unmaintained/dropper/awn-applet-dropper.schema-ini.in
 applets/unmaintained/dropper/dropper.desktop.in
 applets/unmaintained/dropper/dropper-prefs.ui