--- a/feedworm-gui.py	Thu Sep 09 16:47:38 2010 +0200
+++ b/feedworm-gui.py	Wed Nov 17 21:22:31 2010 +0100
@@ -3,17 +3,28 @@
 from MainWindow import MainWindow
 from Preferences import Preferences
 from PyQt4 import QtGui
+from PyQt4.QtNetwork import QNetworkProxy
 import sys
 import util
 
+def setupProxy(preferences):
+    if preferences.isProxyConfigured():
+        proxyHost = preferences.proxyHost()
+        proxyPort = preferences.proxyPort()
+        proxy = QNetworkProxy(QNetworkProxy.HttpProxy, proxyHost, proxyPort)
+        QNetworkProxy.setApplicationProxy(proxy)
+
 if __name__ == '__main__':
     util.configureLogging()
     session = Database.createSession()
-    
+    preferences = Preferences(session)
+
+    setupProxy(preferences)
+
     app = QtGui.QApplication(sys.argv)
     mainWindow = MainWindow(session)
-    
-    maximized = Preferences(session).startMaximized()
+
+    maximized = preferences.startMaximized()
     if maximized:
         mainWindow.showMaximized()
     else: