Merge branch 'patch5884'

Conflicts:
	src/config.py

diff --cc src/FeedingIt.py
Simple merge

diff --cc src/config.py
index 4d10723,5497b9e..2d361ac
--- 1/src/config.py
--- 2/src/config.py
+++ b/src/config.py
@@@ -30,12 -30,12 +30,12 @@@ from gobject import idle_ad
  from gconf import client_get_default
  from urllib2 import ProxyHandler
  
 -VERSION = "0.6.1"
 +VERSION = "48"
  
  section = "FeedingIt"
- ranges = { "updateInterval":[0.5, 1, 2, 4, 12, 24], "expiry":[24, 48, 72], "fontSize":range(12,24), "orientation":["Automatic", "Landscape", "Portrait"], "artFontSize":[10, 12, 14, 16, 18, 20]}
- titles = {"updateInterval":"Auto-update interval", "expiry":"Delete articles", "fontSize":"List font size", "orientation":"Display orientation", "artFontSize":"Article font size"}
- subtitles = {"updateInterval":"Every %s hours", "expiry":"After %s hours", "fontSize":"%s pixels", "orientation":"%s", "artFontSize":"%s pixels"}
+ ranges = { "updateInterval":[0.5, 1, 2, 4, 12, 24], "expiry":[24, 48, 72], "fontSize":range(12,24), "orientation":["Automatic", "Landscape", "Portrait"], "artFontSize":[10, 12, 14, 16, 18, 20], "feedsort":["Manual", "Most unread", "Least unread", "Most recent", "Least recent"] }
+ titles = {"updateInterval":"Auto-update interval", "expiry":"Delete articles", "fontSize":"List font size", "orientation":"Display orientation", "artFontSize":"Article font size","feedsort":"Feed sort order"}
+ subtitles = {"updateInterval":"Every %s hours", "expiry":"After %s hours", "fontSize":"%s pixels", "orientation":"%s", "artFontSize":"%s pixels", "feedsort":"%s"}
  
  class Config():
      def __init__(self, parent, configFilename):
@@@ -209,9 -201,9 +210,13 @@@
              self.config["hidereadfeeds"] = False
              self.config["hidereadarticles"] = False
          try:
 +            self.config["extBrowser"] = configParser.getboolean(section, "extBrowser")
 +        except:
 +            self.config["extBrowser"] = False
++        try:
+             self.config["feedsort"] = configParser.get(section, "feedsort")
+         except:
+             self.config["feedsort"] = "Manual"
          
      def saveConfig(self):
          configParser = RawConfigParser()
@@@ -226,7 -218,7 +231,8 @@@
          configParser.set(section, 'proxy', str(self.config["proxy"]))
          configParser.set(section, 'hidereadfeeds', str(self.config["hidereadfeeds"]))
          configParser.set(section, 'hidereadarticles', str(self.config["hidereadarticles"]))
 +        configParser.set(section, 'extBrowser', str(self.config["extBrowser"]))
+         configParser.set(section, 'feedsort', str(self.config["feedsort"]))
  
          # Writing our configuration file
          file = open(self.configFilename, 'wb')
@@@ -278,5 -270,5 +284,7 @@@
          return self.config["hidereadfeeds"]
      def getHideReadArticles(self):
          return self.config["hidereadarticles"]
 +    def getOpenInExternalBrowser(self):
 +        return self.config["extBrowser"]
+     def getFeedSortOrder(self):
+         return self.config["feedsort"]

diff --cc src/rss.py
Simple merge