Re-added ability to delete ArchivedArticles feed

diff --git a/debian/changelog b/debian/changelog
index 234cc65..622e3bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ feedingit (0.7.0-3) unstable; urgency=low
   * Fixed re-layout of article listing when switching portrait to/from landscape
   * Fixed landscape rotation bug for PR1.2 (by Thp)
   * Better UI and interaction for menus, the settings dialog and subscriptions menu (Thp)
+  * Added grey background colour to article listing
 
- -- Yves <yves@marcoz.org>  Mon, 07 May 2010 22:41:19 -0800
+ -- Yves <yves@marcoz.org>  Tue, 08 Jun 2010 07:34:19 -0800
 
 feedingit (0.7.0-2) unstable; urgency=low
 

diff --git a/src/FeedingIt.py b/src/FeedingIt.py
index 9b809ce..e73eca3 100644 (file)
--- a/src/FeedingIt.py
+++ b/src/FeedingIt.py
@@ -412,17 +412,13 @@ class SortList(hildon.StackableWindow):
     def buttonDelete(self, button):
         key = self.getSelectedItem()
 
-        if key == 'ArchivedArticles':
-            message = 'Cannot remove the archived articles feed.'
-            hildon.hildon_banner_show_information(self, '', message)
-        elif key is not None:
-            message = 'Really remove this feed and its entries?'
-            dlg = hildon.hildon_note_new_confirmation(self, message)
-            response = dlg.run()
-            dlg.destroy()
-            if response == gtk.RESPONSE_OK:
-                self.listing.removeFeed(key)
-                self.refreshList()
+        message = 'Really remove this feed and its entries?'
+        dlg = hildon.hildon_note_new_confirmation(self, message)
+        response = dlg.run()
+        dlg.destroy()
+        if response == gtk.RESPONSE_OK:
+            self.listing.removeFeed(key)
+            self.refreshList()
 
     def buttonEdit(self, button):
         key = self.getSelectedItem()