From 6b30eeaba13711b0b1ece97d3a614ec75601027f Mon Sep 17 00:00:00 2001
From: HomeWorld <homeworld@gmail.com>
Date: Fri, 23 Dec 2011 20:26:15 +0200
Subject: [PATCH] Make use of proxy settings in service.character api stuff

---
 .../pyfaGlobalPreferences.py                      |  7 +++----
 service/character.py                              | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gui/builtinPreferenceViews/pyfaGlobalPreferences.py b/gui/builtinPreferenceViews/pyfaGlobalPreferences.py
index 45ac97509..2099de9a4 100644
--- a/gui/builtinPreferenceViews/pyfaGlobalPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaGlobalPreferences.py
@@ -125,13 +125,12 @@ class PFGlobalPref ( PreferenceView):
 
         proxy = self.proxySettings.autodetect()
 
-        txt = "Auto-detected: "
         if len(proxy) == 0:
-            txt += "None"
+            txt = "None"
         else:
-            txt += proxy
+            txt = proxy
 
-        self.stPSAutoDetected.SetLabel(txt)
+        self.stPSAutoDetected.SetLabel("Auto-detected: " + txt)
         self.stPSAutoDetected.Disable()
 
         cChar = service.Character.getInstance()
diff --git a/service/character.py b/service/character.py
index 8bd63a6be..58965fee0 100644
--- a/service/character.py
+++ b/service/character.py
@@ -113,17 +113,28 @@ class Character():
         char = eos.db.getCharacter(charID)
         return (char.apiID or "", char.apiKey or "")
 
+    def getProxySettings(self):
+        ps = service.settings.ProxySettings.getInstance()
+        if ps.getMode() == 0:
+            return None
+        elif ps.getMode() == 1:
+            return ps.autodetect()
+        elif ps.getMode == 2:
+            return ps.getAddress() + ps.getPort()
+
+
     def charList(self, charID, userID, apiKey):
         char = eos.db.getCharacter(charID)
         try:
             char.apiID = userID
             char.apiKey = apiKey
-            return char.apiCharList()
+            return char.apiCharList(proxy = self.getProxySettings())
         except:
             return None
 
     def apiFetch(self, charID, charName):
-        char = eos.db.getCharacter(charID)
+
+        char = eos.db.getCharacter(charID, proxy = self.getProxySettings())
         char.apiFetch(charName)
         eos.db.commit()