fixed #1151

2 files changed, 11 insertions, 4 deletions

diff --git a/src/connection.py b/src/connection.py
index 0e26f008..1876cdb6 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -60,7 +60,15 @@ class Connection(threading.Thread):
 
     def connect_to_server(self, server, port):
         # TODO proxy stuff
-        return self.client.connect((server, port))
+        if config.get('use_proxy','false') == 'true':
+            return self.client.connect((server, port),
+                                       {'host': config.get("proxy_server", ""),
+                                        'port': config.get("proxy_port", 1080),
+                                        'user': config.get("proxy_user", ""),
+                                        'password': config.get("proxy_password", "")
+                                        })
+        else:
+            return self.client.connect((server, port))
 
     def authenticate(self, anon=True):
         if anon:
diff --git a/src/gui.py b/src/gui.py
index ff146c9c..1ef00785 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -203,11 +203,10 @@ class Gui(object):
             'away': (self.command_away, _('Usage: /away [message]\nAway: Sets your availability to away and (optional) sets your status message. This is equivalent to "/show away [message]"')),
             'busy': (self.command_busy, _('Usage: /busy [message]\nBusy: Sets your availability to busy and (optional) sets your status message. This is equivalent to "/show busy [message]"')),
             'avail': (self.command_avail, _('Usage: /avail [message]\nAvail: Sets your availability to available and (optional) sets your status message. This is equivalent to "/show available [message]"')),
-            'available': (self.command_avail, _('Usage: /available [message]\nAvailable: Sets your availability to available and (optional) sets your status message. This is equivalent to "/show available [message]"')),
-            'bookmark': (self.command_bookmark, _('Usage: /bookmark [roomname][/nick]\nBookmark: Bookmark the specified room (you will then auto-join it on each poezio start). This commands uses the same syntaxe as /join. Type /help join for syntaxe examples. Note that when typing "/bookmark" on its own, the room will be bookmarked with the nickname you\'re currently using in this room (instead of default_nick)')),
+            'available': (self.command_avail, _('Usage: /available [message]\nAvailable: Sets your availability to available and (optional) sets your status message. This is equivalent to "/show available [message]"')), 
+           'bookmark': (self.command_bookmark, _('Usage: /bookmark [roomname][/nick]\nBookmark: Bookmark the specified room (you will then auto-join it on each poezio start). This commands uses the same syntaxe as /join. Type /help join for syntaxe examples. Note that when typing "/bookmark" on its own, the room will be bookmarked with the nickname you\'re currently using in this room (instead of default_nick)')),
             'set': (self.command_set, _('Usage: /set <option> [value]\nSet: Sets the value to the option in your configuration file. You can, for example, change your default nickname by doing `/set default_nick toto` or your resource with `/set resource blabla`. You can also set an empty value (nothing) by providing no [value] after <option>.')),
             'kick': (self.command_kick, _('Usage: /kick <nick> [reason]\nKick: Kick the user with the specified nickname. You also can give an optional reason.')),
-            # 'ban': (self.command_ban, _('Usage: /ban <nick> [reason]\nBan: Ban the user with the specified nickname. You also can give an optional reason.')),
             'nick': (self.command_nick, _('Usage: /nick <nickname>\nNick: Change your nickname in the current room'))
             }